more template cleanup

Author: dcarbone

template/versions/types/methods/constructors/resource_container_property_setter_call.php

@@ -55,7 +55,7 @@
                 $typeClass = new $typeClassName($d);
             } else if (!is_object($data[self::<?php echo $propertyFieldConst; ?>]) || !($data[self::<?php echo $propertyFieldConst; ?>] instanceof <?php echo PHPFHIR_INTERFACE_VERSION_CONTAINED_TYPE; ?>)) {
                 throw new \InvalidArgumentException(sprintf(
-                    '<?php echo $typeClassName; ?> - Field "<?php echo $propertyName; ?>" must be an object implementing <?php echo $version->getFullyQualifiedName(true, PHPFHIR_INTERFACE_VERSION_CONTAINED_TYPE); ?>, object of type %s seen',
+                    '<?php echo $typeClassName; ?> - Field "<?php echo $propertyName; ?>" must be an array or object implementing <?php echo $version->getFullyQualifiedName(true, PHPFHIR_INTERFACE_VERSION_CONTAINED_TYPE); ?>, %s seen',
                     is_object($data[self::<?php echo $propertyFieldConst; ?>]) ? get_class($data[self::<?php echo $propertyFieldConst; ?>]) : gettype($data[self::<?php echo $propertyFieldConst; ?>])
                 ));
             } else {

template/versions/types/serialization/json.php

@@ -33,14 +33,6 @@
             'type'     => $type,
         ]
     );
-elseif ($typeKind->isResourceContainer($version)) :
-    echo require_with(
-        PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'resource_container.php',
-        [
-            'version' => $version,
-            'type' => $type,
-        ]
-    );
 else:
     echo require_with(
         PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'default.php',

template/versions/types/serialization/json/resource_container.php

@@ -49,35 +49,24 @@
 
 <?php
 // serialize portion
-// ResourceContainer and Resource.Inline types have their own special xml serialization mechanism
-if ($typeKind->isOneOf(TypeKindEnum::RESOURCE_CONTAINER, TypeKindEnum::RESOURCE_INLINE)) {
-    echo require_with(
-            PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'resource_container.php',
-            [
-                'version' => $version,
-                'type' => $type,
-            ]
-    );
-} else {
-    // everything else shares a common header
+echo require_with(
+        PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'header.php',
+    [
+        'version' => $version,
+        'type' => $type,
+    ]
+);
+
+if ($type->hasLocalProperties()) {
     echo require_with(
-            PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'header.php',
+        PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'body.php',
         [
             'version' => $version,
             'type' => $type,
         ]
     );
-
-    if ($type->hasLocalProperties()) {
-        echo require_with(
-            PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'body.php',
-            [
-                'version' => $version,
-                'type' => $type,
-            ]
-        );
-    }
-} ?>
+}
+?>
         if (isset($rootOpened) && $rootOpened) {
             $xw->endElement();
         }