misc cleanup

src/Definition/Decorator/AnnotationElementPropertyTypeDecorator.php

@@ -56,12 +56,7 @@ public static function decorate(
         foreach ($annotation->children('xs', true) as $child) {
             switch ($child->getName()) {
                 case ElementName::DOCUMENTATION->value:
-                    TypeBuilderUtils::setPropertyStringFromElementValue(
-                        $property,
-                        $annotation,
-                        $child,
-                        'addDocumentationFragment'
-                    );
+                    $property->addDocumentationFragment((string)$child);
                     break;
                 case ElementName::COMPLEX_CONTENT->value:
                     ComplexContentElementTypeDecorator::decorate($config, $types, $type, $child);

src/Definition/Types.php

@@ -41,6 +41,14 @@ class Types implements Countable
      */
     private Type $containerType;
 
+    private const _CONTAINED_IGNORED_TYPES = [
+        TypeKind::RESOURCE_INLINE,
+        TypeKind::RESOURCE_CONTAINER,
+        TypeKind::_LIST,
+        TypeKind::PRIMITIVE,
+        TypeKind::PRIMITIVE_CONTAINER,
+    ];
+
     /**
      * FHIRTypes constructor.
      * @param \DCarbone\PHPFHIR\Config\VersionConfig $config
@@ -150,7 +158,7 @@ public function getIterator(): iterable
      *
      * @return \DCarbone\PHPFHIR\Definition\Type[]
      */
-    public function getSortedIterator(): iterable
+    public function getNameSortedIterator(): iterable
     {
         $tmp = $this->types;
         usort(
@@ -200,16 +208,8 @@ public function getContainerType(): ?Type
      */
     public function isContainedType(Type $type): bool
     {
-        static $ignoredTypes = [
-            TypeKind::RESOURCE_INLINE,
-            TypeKind::RESOURCE_CONTAINER,
-            TypeKind::_LIST,
-            TypeKind::PRIMITIVE,
-            TypeKind::PRIMITIVE_CONTAINER,
-        ];
-
         // only bother with actual Resource types.
-        if ($type->getKind()->isOneOf(...$ignoredTypes)) {
+        if ($type->getKind()->isOneOf(...self::_CONTAINED_IGNORED_TYPES)) {
             return false;
         }
         $container = $this->getContainerType();

src/Enum/AttributeName.php

@@ -24,7 +24,7 @@
  */
 enum AttributeName : string
 {
-    use EnumCompat;
+    use ValuesTrait;
 
     case NAME         = 'name';
     case VALUE        = 'value';

src/Enum/ElementName.php

@@ -19,7 +19,7 @@
  */
 enum ElementName : string
 {
-    use EnumCompat;
+    use ValuesTrait;
 
     case _INCLUDE = 'include';
     case IMPORT   = 'import';

src/Enum/PrimitiveType.php

@@ -21,7 +21,7 @@
 use DCarbone\PHPFHIR\Utilities\ExceptionUtils;
 enum PrimitiveType:string
 {
-    use EnumCompat;
+    use ValuesTrait;
 
     case STRING = 'string';
     case BOOLEAN = 'boolean';

src/Enum/PropertyUse.php

@@ -24,7 +24,7 @@
  */
 enum PropertyUse: string
 {
-    use EnumCompat;
+    use ValuesTrait;
 
     case PROHIBITED = 'prohibited';
     case OPTIONAL   = 'optional';

src/Enum/TypeKind.php

@@ -19,7 +19,7 @@
  */
 enum TypeKind: string
 {
-    use EnumCompat;
+    use ValuesTrait;
 
     // this represents an actual value: string, int, etc.
     case PRIMITIVE = 'primitive';

src/Enum/EnumCompat.php → src/Enum/ValuesTrait.php

@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-trait EnumCompat
+trait ValuesTrait
 {
     /**
      * @return string[]

src/LogLevel.php

@@ -18,12 +18,12 @@
  * limitations under the License.
  */
 
-use DCarbone\PHPFHIR\Enum\EnumCompat;
+use DCarbone\PHPFHIR\Enum\ValuesTrait;
 use Psr\Log\LogLevel as PLogLevel;
 
 enum LogLevel: string
 {
-    use EnumCompat;
+    use ValuesTrait;
 
     case EMERGENCY = PLogLevel::EMERGENCY;
     case ALERT = PLogLevel::ALERT;

src/Utilities/TypeBuilderUtils.php

@@ -170,7 +170,7 @@ public static function setTypeIntegerFromAttribute(
                 )
             );
         }
-        self::callTypeSetter($type, $parentElement, $attribute, $setterMethod, intval($int, 10));
+        self::callTypeSetter($type, $parentElement, $attribute, $setterMethod, intval($int));
     }
 
     /**
@@ -195,21 +195,15 @@ public static function setTypeIntegerFromElementAttribute(
     /**
      * @param \DCarbone\PHPFHIR\Definition\Type $type
      * @param \SimpleXMLElement $parentElement
-     * @param \SimpleXMLElement $enum
+     * @param \SimpleXMLElement $enumElement
      */
-    public static function addTypeEnumeratedValue(Type $type, \SimpleXMLElement $parentElement, \SimpleXMLElement $enum): void
+    public static function addTypeEnumeratedValue(Type $type, \SimpleXMLElement $parentElement, \SimpleXMLElement $enumElement): void
     {
-        $value = $enum->attributes()->value;
+        $value = $enumElement->attributes()->value;
         if (null === $value) {
-            throw ExceptionUtils::createExpectedTypeElementAttributeNotFoundException($type, $enum, 'value');
+            throw ExceptionUtils::createExpectedTypeElementAttributeNotFoundException($type, $enumElement, 'value');
         }
-        self::callTypeSetter(
-            $type,
-            $parentElement,
-            $enum,
-            'addEnumerationValue',
-            new EnumerationValue((string)$value, $enum)
-        );
+        $type->addEnumerationValue(new EnumerationValue((string)$value, $enumElement));
     }
 
     /**

template/tests/test_class_constants.php

@@ -41,7 +41,7 @@
  */
 class <?php echo PHPFHIR_TEST_CLASSNAME_CONSTANTS; ?> extends TestCase
 {
-<?php foreach($types->getSortedIterator() as $type) : ?>
+<?php foreach($types->getNameSortedIterator() as $type) : ?>
     public function testTypeConstantsDefined<?php echo str_replace('\\', '_', $type->getFullyQualifiedClassName(false)); ?>()
     {
         $this->assertEquals('<?php echo $type->getFHIRName(); ?>', <?php echo $type->getTypeNameConst(true); ?>);

template/tests/test_class_type_map.php

@@ -48,7 +48,7 @@ public function testGetTypeClassWithNonStringReturnsNull()
 
     public function testGetContainedTypeClassName()
     {
-<?php foreach($types->getSortedIterator() as $type) :
+<?php foreach($types->getNameSortedIterator() as $type) :
     if ($type->isContainedType()) : ?>
         $this->assertEquals('<?php echo $type->getFullyQualifiedClassName(true); ?>', <?php echo PHPFHIR_CLASSNAME_TYPEMAP; ?>::getContainedTypeClassName('<?php echo $type->getFHIRName(); ?>'));
 <?php else : ?>
@@ -59,7 +59,7 @@ public function testGetContainedTypeClassName()
 
     public function testIsContainableResourceWithClassname()
     {
-<?php foreach($types->getSortedIterator() as $type) :
+<?php foreach($types->getNameSortedIterator() as $type) :
     if ($type->isContainedType()) : ?>
         $this->assertTrue(<?php echo PHPFHIR_CLASSNAME_TYPEMAP; ?>::isContainableResource('<?php echo $type->getFullyQualifiedClassName(false); ?>'));
         $this->assertTrue(<?php echo PHPFHIR_CLASSNAME_TYPEMAP; ?>::isContainableResource('<?php echo $type->getFullyQualifiedClassName(true); ?>'));
@@ -72,7 +72,7 @@ public function testIsContainableResourceWithClassname()
 
     public function testIsContainableResourceWithTypeName()
     {
-<?php foreach($types->getSortedIterator() as $type) :
+<?php foreach($types->getNameSortedIterator() as $type) :
     if ($type->isContainedType()) : ?>
         $this->assertTrue(<?php echo PHPFHIR_CLASSNAME_TYPEMAP; ?>::isContainableResource('<?php echo $type->getFHIRName(); ?>'));
 <?php else : ?>
@@ -83,7 +83,7 @@ public function testIsContainableResourceWithTypeName()
 
     public function testIsContainableResourceWithInstance()
     {
-<?php foreach($types->getSortedIterator() as $type) : ?>
+<?php foreach($types->getNameSortedIterator() as $type) : ?>
         $type = new <?php echo $type->getFullyQualifiedClassName(true); ?>;
 <?php if ($type->isContainedType()) : ?>
         $this->assertTrue(<?php echo PHPFHIR_CLASSNAME_TYPEMAP; ?>::isContainableResource($type));

template/utilities/constants.php

@@ -77,12 +77,12 @@ abstract class <?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>
     public const <?php echo PHPFHIR_VALIDATION_MAX_OCCURS_NAME; ?> = '<?php echo PHPFHIR_VALIDATION_MAX_OCCURS; ?>';
 
     // Type names
-<?php foreach($types->getSortedIterator() as $type) : ?>
+<?php foreach($types->getNameSortedIterator() as $type) : ?>
     public const <?php echo $type->getTypeNameConst(false); ?> = '<?php echo $type->getFHIRName(); ?>';
 <?php endforeach;?>
 
     // Type classes
-<?php foreach($types->getSortedIterator() as $type) : ?>
+<?php foreach($types->getNameSortedIterator() as $type) : ?>
     public const <?php echo $type->getClassNameConst(false); ?> = '<?php echo str_replace('\\', '\\\\', $type->getFullyQualifiedClassName(true)); ?>';
 <?php endforeach;
 echo "}\n";

template/utilities/typemap_class.php

@@ -69,7 +69,7 @@ abstract class <?php echo PHPFHIR_CLASSNAME_TYPEMAP; ?>
      * This array represents every type known to this lib
      */
     private const TYPE_MAP = [
-<?php foreach ($types->getSortedIterator() as $type) : ?>
+<?php foreach ($types->getNameSortedIterator() as $type) : ?>
         <?php echo $type->getTypeNameConst(true); ?> => <?php echo $type->getClassNameConst(true); ?>,
 <?php endforeach; ?>    ];