Rework meta to custom attributes

goetas-webservices · Jun 4, 2024 · 1d03126 · 1d03126
1 parent ee6189f
commit 1d03126
Show file tree

Hide file tree

Showing 13 changed files with 158 additions and 199 deletions.
diff --git a/src/Schema/Attribute/AbstractAttributeItem.php b/src/Schema/Attribute/AbstractAttributeItem.php
@@ -4,12 +4,12 @@
 
 namespace GoetasWebservices\XML\XSDReader\Schema\Attribute;
 
+use GoetasWebservices\XML\XSDReader\Schema\CustomAttributeContainerTrait;
 use GoetasWebservices\XML\XSDReader\Schema\Item;
-use GoetasWebservices\XML\XSDReader\Schema\MetaInformationContainerTrait;
 
 abstract class AbstractAttributeItem extends Item implements AttributeSingle
 {
-    use MetaInformationContainerTrait;
+    use CustomAttributeContainerTrait;
 
     protected ?string $fixed = null;
 

diff --git a/src/Schema/Attribute/AttributeSingle.php b/src/Schema/Attribute/AttributeSingle.php
@@ -4,10 +4,10 @@
 
 namespace GoetasWebservices\XML\XSDReader\Schema\Attribute;
 
-use GoetasWebservices\XML\XSDReader\Schema\MetaInformationContainerInterface;
+use GoetasWebservices\XML\XSDReader\Schema\CustomAttributeContainerInterface;
 use GoetasWebservices\XML\XSDReader\Schema\Type\Type;
 
-interface AttributeSingle extends AttributeItem, MetaInformationContainerInterface
+interface AttributeSingle extends AttributeItem, CustomAttributeContainerInterface
 {
     public const USE_OPTIONAL = 'optional';
 

diff --git a/src/Schema/CustomAttribute.php b/src/Schema/CustomAttribute.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GoetasWebservices\XML\XSDReader\Schema;
+
+/**
+ * Contains the information of additional custom attributes that are not part of the XSD specification.
+ *
+ * For example:
+ * <xsd:element name="myElement" dfdl:encoding="iso-8859-1" />
+ */
+class CustomAttribute
+{
+    private string $namespaceURI;
+
+    private string $name;
+
+    private string $value;
+
+    public function __construct(
+        string $namespaceURI,
+        string $name,
+        string $value
+    ) {
+        $this->namespaceURI = $namespaceURI;
+        $this->name = $name;
+        $this->value = $value;
+    }
+
+    public function getNamespaceURI(): string
+    {
+        return $this->namespaceURI;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/src/Schema/CustomAttributeContainerInterface.php b/src/Schema/CustomAttributeContainerInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GoetasWebservices\XML\XSDReader\Schema;
+
+interface CustomAttributeContainerInterface
+{
+    /**
+     * @param list<CustomAttribute> $customAttributes
+     */
+    public function setCustomAttributes(array $customAttributes): void;
+
+    /**
+     * @return list<CustomAttribute>
+     */
+    public function getCustomAttributes(): array;
+}
diff --git a/src/Schema/CustomAttributeContainerTrait.php b/src/Schema/CustomAttributeContainerTrait.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GoetasWebservices\XML\XSDReader\Schema;
+
+trait CustomAttributeContainerTrait
+{
+    /**
+     * @var list<CustomAttribute>
+     */
+    protected array $customAttributes = [];
+
+    /**
+     * @return list<CustomAttribute>
+     */
+    public function getCustomAttributes(): array
+    {
+        return $this->customAttributes;
+    }
+
+    /**
+     * @param list<CustomAttribute> $customAttributes
+     */
+    public function setCustomAttributes(array $customAttributes): void
+    {
+        $this->customAttributes = $customAttributes;
+    }
+}
diff --git a/src/Schema/Element/AbstractElementSingle.php b/src/Schema/Element/AbstractElementSingle.php
@@ -4,12 +4,12 @@
 
 namespace GoetasWebservices\XML\XSDReader\Schema\Element;
 
+use GoetasWebservices\XML\XSDReader\Schema\CustomAttributeContainerTrait;
 use GoetasWebservices\XML\XSDReader\Schema\Item;
-use GoetasWebservices\XML\XSDReader\Schema\MetaInformationContainerTrait;
 
 class AbstractElementSingle extends Item implements ElementSingle, InterfaceSetAbstract
 {
-    use MetaInformationContainerTrait;
+    use CustomAttributeContainerTrait;
 
     protected int $min = 1;
 

diff --git a/src/Schema/Element/ElementSingle.php b/src/Schema/Element/ElementSingle.php
@@ -4,10 +4,10 @@
 
 namespace GoetasWebservices\XML\XSDReader\Schema\Element;
 
-use GoetasWebservices\XML\XSDReader\Schema\MetaInformationContainerInterface;
+use GoetasWebservices\XML\XSDReader\Schema\CustomAttributeContainerInterface;
 use GoetasWebservices\XML\XSDReader\Schema\Type\Type;
 
-interface ElementSingle extends ElementItem, InterfaceSetMinMax, InterfaceSetFixed, InterfaceSetDefault, MetaInformationContainerInterface
+interface ElementSingle extends ElementItem, InterfaceSetMinMax, InterfaceSetFixed, InterfaceSetDefault, CustomAttributeContainerInterface
 {
     public function getType(): ?Type;
 

diff --git a/src/Schema/MetaInformation.php b/src/Schema/MetaInformation.php
diff --git a/src/Schema/MetaInformationContainerInterface.php b/src/Schema/MetaInformationContainerInterface.php
diff --git a/src/Schema/MetaInformationContainerTrait.php b/src/Schema/MetaInformationContainerTrait.php
diff --git a/src/SchemaReader.php b/src/SchemaReader.php
@@ -15,6 +15,7 @@
 use GoetasWebservices\XML\XSDReader\Schema\Attribute\AttributeRef;
 use GoetasWebservices\XML\XSDReader\Schema\Attribute\AttributeSingle;
 use GoetasWebservices\XML\XSDReader\Schema\Attribute\Group as AttributeGroup;
+use GoetasWebservices\XML\XSDReader\Schema\CustomAttribute;
 use GoetasWebservices\XML\XSDReader\Schema\Element\AbstractElementSingle;
 use GoetasWebservices\XML\XSDReader\Schema\Element\Choice;
 use GoetasWebservices\XML\XSDReader\Schema\Element\Element;
@@ -28,14 +29,12 @@
 use GoetasWebservices\XML\XSDReader\Schema\Element\InterfaceSetFixed;
 use GoetasWebservices\XML\XSDReader\Schema\Element\InterfaceSetMinMax;
 use GoetasWebservices\XML\XSDReader\Schema\Element\Sequence;
-use GoetasWebservices\XML\XSDReader\Schema\Exception\SchemaException;
 use GoetasWebservices\XML\XSDReader\Schema\Exception\TypeNotFoundException;
 use GoetasWebservices\XML\XSDReader\Schema\Inheritance\Base;
 use GoetasWebservices\XML\XSDReader\Schema\Inheritance\Extension;
 use GoetasWebservices\XML\XSDReader\Schema\Inheritance\Restriction;
 use GoetasWebservices\XML\XSDReader\Schema\Inheritance\RestrictionType;
 use GoetasWebservices\XML\XSDReader\Schema\Item;
-use GoetasWebservices\XML\XSDReader\Schema\MetaInformation;
 use GoetasWebservices\XML\XSDReader\Schema\Schema;
 use GoetasWebservices\XML\XSDReader\Schema\SchemaItem;
 use GoetasWebservices\XML\XSDReader\Schema\Type\BaseComplexType;
@@ -239,27 +238,26 @@ private function fillAttribute(AttributeSingle $attribute, \DOMElement $node): v
             $attribute->setUse($node->getAttribute('use'));
         }
 
-        $attribute->setMeta($this->loadMetaAttributesForElement($attribute, $node));
+        $attribute->setCustomAttributes($this->loadCustomAttributesForElement($attribute, $node));
     }
 
     /**
-     * @return list<MetaInformation>
+     * @return list<CustomAttribute>
      */
-    private function loadMetaAttributesForElement(SchemaItem $item, \DOMElement $node): array
+    private function loadCustomAttributesForElement(SchemaItem $item, \DOMElement $node): array
     {
-        $meta = [];
+        $customAttributes = [];
         foreach ($node->attributes as $attr) {
             if (null !== $attr->namespaceURI && self::XSD_NS !== $attr->namespaceURI) {
-                $meta[] = new MetaInformation(
-                    $this->findSchemaForNamespace($item->getSchema(), $attr->parentNode->namespaceURI),
+                $customAttributes[] = new CustomAttribute(
                     $attr->namespaceURI,
                     $attr->name,
                     $attr->value
                 );
             }
         }
 
-        return $meta;
+        return $customAttributes;
     }
 
     private function loadAttributeOrElementDef(
@@ -1117,19 +1115,6 @@ private function findType(Schema $schema, \DOMElement $node, string $typeName):
         throw new TypeException(sprintf("Can't find %s named {%s}#%s, at line %d in %s ", 'type', $namespace, $name, $node->getLineNo(), $node->ownerDocument->documentURI));
     }
 
-    public function findSchemaForNamespace(Schema $currentSchema, string $namespace): Schema
-    {
-        if ($currentSchema->getTargetNamespace() === $namespace) {
-            return $currentSchema;
-        }
-
-        if (array_key_exists($namespace, $this->loadedSchemas) && count($this->loadedSchemas[$namespace]) > 0) {
-            return $this->loadedSchemas[$namespace][0];
-        }
-
-        throw new SchemaException(sprintf("Can't find schema for namespace %s", $namespace));
-    }
-
     private function fillItem(Item $element, \DOMElement $node, ?\DOMElement $parentNode = null): void
     {
         if ($element instanceof ElementDef) {
@@ -1494,7 +1479,7 @@ private function fillElement(AbstractElementSingle $element, \DOMElement $node):
             }
         }
 
-        $element->setMeta($this->loadMetaAttributesForElement($element, $node));
+        $element->setCustomAttributes($this->loadCustomAttributesForElement($element, $node));
     }
 
     private function addAttributeFromAttributeOrRef(