latest output from generator

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 
@@ -274,18 +274,28 @@ public static function xmlUnserialize($sxe = null, PHPFHIRTypeInterface $type =
         }
         $attributes = $sxe->attributes();
         $children = $sxe->children();
-        if (isset($attributes->contentType)) {
-            $type->setContentType((string)$attributes->contentType);
-        }
         if (isset($children->contentType)) {
             $type->setContentType(FHIRStringPrimitive::xmlUnserialize($children->contentType));
         }
-        if (isset($attributes->id)) {
-            $type->setId((string)$attributes->id);
+        if (isset($attributes->contentType)) {
+            $pt = $type->getContentType();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->contentType);
+            } else {
+                $type->setContentType((string)$attributes->contentType);
+            }
         }
         if (isset($children->id)) {
             $type->setId(FHIRIdPrimitive::xmlUnserialize($children->id));
         }
+        if (isset($attributes->id)) {
+            $pt = $type->getId();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->id);
+            } else {
+                $type->setId((string)$attributes->id);
+            }
+        }
         return $type;
     }
 
@@ -301,7 +311,8 @@ 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;

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 
@@ -326,12 +326,17 @@ public static function xmlUnserialize($sxe = null, PHPFHIRTypeInterface $type =
                 $type->addExtension(FHIRExtension::xmlUnserialize($child));
             }
         }
-        if (isset($attributes->id)) {
-            $type->setId((string)$attributes->id);
-        }
         if (isset($children->id)) {
             $type->setId(FHIRIdPrimitive::xmlUnserialize($children->id));
         }
+        if (isset($attributes->id)) {
+            $pt = $type->getId();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->id);
+            } else {
+                $type->setId((string)$attributes->id);
+            }
+        }
         return $type;
     }
 
@@ -345,15 +350,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872
         if (null === $sxe) {
             $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false);
         }
-
         if ([] !== ($vs = $this->getExtension())) {
             foreach($vs as $v) {
                 if (null === $v) {
                     continue;
                 }
                 $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;

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 
@@ -705,20 +705,27 @@ public static function xmlUnserialize($sxe = null, PHPFHIRTypeInterface $type =
         }
         $attributes = $sxe->attributes();
         $children = $sxe->children();
-        if (isset($attributes->city)) {
-            $type->setCity((string)$attributes->city);
-        }
         if (isset($children->city)) {
             $type->setCity(FHIRString::xmlUnserialize($children->city));
         }
-        if (isset($attributes->country)) {
-            $type->setCountry((string)$attributes->country);
+        if (isset($attributes->city)) {
+            $pt = $type->getCity();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->city);
+            } else {
+                $type->setCity((string)$attributes->city);
+            }
         }
         if (isset($children->country)) {
             $type->setCountry(FHIRString::xmlUnserialize($children->country));
         }
-        if (isset($attributes->line)) {
-            $type->addLine((string)$attributes->line);
+        if (isset($attributes->country)) {
+            $pt = $type->getCountry();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->country);
+            } else {
+                $type->setCountry((string)$attributes->country);
+            }
         }
         if (isset($children->line)) {
             foreach($children->line as $child) {
@@ -728,27 +735,42 @@ public static function xmlUnserialize($sxe = null, PHPFHIRTypeInterface $type =
         if (isset($children->period)) {
             $type->setPeriod(FHIRPeriod::xmlUnserialize($children->period));
         }
-        if (isset($attributes->state)) {
-            $type->setState((string)$attributes->state);
-        }
         if (isset($children->state)) {
             $type->setState(FHIRString::xmlUnserialize($children->state));
         }
-        if (isset($attributes->text)) {
-            $type->setText((string)$attributes->text);
+        if (isset($attributes->state)) {
+            $pt = $type->getState();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->state);
+            } else {
+                $type->setState((string)$attributes->state);
+            }
         }
         if (isset($children->text)) {
             $type->setText(FHIRString::xmlUnserialize($children->text));
         }
+        if (isset($attributes->text)) {
+            $pt = $type->getText();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->text);
+            } else {
+                $type->setText((string)$attributes->text);
+            }
+        }
         if (isset($children->use)) {
             $type->setUse(FHIRAddressUse::xmlUnserialize($children->use));
         }
-        if (isset($attributes->zip)) {
-            $type->setZip((string)$attributes->zip);
-        }
         if (isset($children->zip)) {
             $type->setZip(FHIRString::xmlUnserialize($children->zip));
         }
+        if (isset($attributes->zip)) {
+            $pt = $type->getZip();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->zip);
+            } else {
+                $type->setZip((string)$attributes->zip);
+            }
+        }
         return $type;
     }
 
@@ -763,7 +785,6 @@ 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()));
         }

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 
@@ -210,12 +210,17 @@ public static function xmlUnserialize($sxe = null, PHPFHIRTypeInterface $type =
         }
         $attributes = $sxe->attributes();
         $children = $sxe->children();
-        if (isset($attributes->value)) {
-            $type->setValue((string)$attributes->value);
-        }
         if (isset($children->value)) {
             $type->setValue(FHIRAddressUseList::xmlUnserialize($children->value));
         }
+        if (isset($attributes->value)) {
+            $pt = $type->getValue();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->value);
+            } else {
+                $type->setValue((string)$attributes->value);
+            }
+        }
         return $type;
     }
 

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 
@@ -210,12 +210,17 @@ public static function xmlUnserialize($sxe = null, PHPFHIRTypeInterface $type =
         }
         $attributes = $sxe->attributes();
         $children = $sxe->children();
-        if (isset($attributes->value)) {
-            $type->setValue((string)$attributes->value);
-        }
         if (isset($children->value)) {
             $type->setValue(FHIRAggregationModeList::xmlUnserialize($children->value));
         }
+        if (isset($attributes->value)) {
+            $pt = $type->getValue();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->value);
+            } else {
+                $type->setValue((string)$attributes->value);
+            }
+        }
         return $type;
     }
 

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 29th, 2019 23:10+0000
+ * Class creation date: November 30th, 2019 21:21+0000
  * 
  * PHPFHIR Copyright:
  * 
@@ -211,12 +211,17 @@ public static function xmlUnserialize($sxe = null, PHPFHIRTypeInterface $type =
         }
         $attributes = $sxe->attributes();
         $children = $sxe->children();
-        if (isset($attributes->value)) {
-            $type->setValue((string)$attributes->value);
-        }
         if (isset($children->value)) {
             $type->setValue(FHIRAlertStatusList::xmlUnserialize($children->value));
         }
+        if (isset($attributes->value)) {
+            $pt = $type->getValue();
+            if (null !== $pt) {
+                $pt->setValue((string)$attributes->value);
+            } else {
+                $type->setValue((string)$attributes->value);
+            }
+        }
         return $type;
     }