Fix namespace exclusion: s/self/static

Author: tvdijen

src/XML/ExtendableAttributesTrait.php

@@ -97,7 +97,7 @@ protected static function getAttributesNSFromXML(
         DOMElement $xml,
         string|array|null $namespace = null,
     ): array {
-        $namespace = $namespace ?? self::XS_ANY_ATTR_NAMESPACE;
+        $namespace = $namespace ?? static::XS_ANY_ATTR_NAMESPACE;
         $exclusionList = self::getAttributeExclusions();
         $attributes = [];
 
@@ -107,7 +107,11 @@ protected static function getAttributesNSFromXML(
             Assert::oneOf($namespace, NS::$PREDEFINED);
 
             foreach ($xml->attributes as $a) {
-                if (in_array([$a->namespaceURI, $a->localName], $exclusionList, true)) {
+                if (
+                    $exclusionList
+                    && (in_array([$a->namespaceURI, $a->localName], $exclusionList, true)
+                        || in_array([$a->namespaceURI, '*'], $exclusionList, true))
+                ) {
                     continue;
                 } elseif ($namespace === NS::OTHER && in_array($a->namespaceURI, [self::NS, null], true)) {
                     continue;
@@ -254,13 +258,13 @@ function (Attribute $attr) {
     public function getAttributeNamespace(): array|string
     {
         Assert::true(
-            defined('self::XS_ANY_ATTR_NAMESPACE'),
+            defined('static::XS_ANY_ATTR_NAMESPACE'),
             self::getClassName(self::class)
             . '::XS_ANY_ATTR_NAMESPACE constant must be defined and set to the namespace for the xs:anyAttribute.',
             RuntimeException::class,
         );
 
-        return self::XS_ANY_ATTR_NAMESPACE;
+        return static::XS_ANY_ATTR_NAMESPACE;
     }
 
 
@@ -271,8 +275,8 @@ public function getAttributeNamespace(): array|string
      */
     public static function getAttributeExclusions(): array
     {
-        if (defined('self::XS_ANY_ATTR_EXCLUSIONS')) {
-            return self::XS_ANY_ATTR_EXCLUSIONS;
+        if (defined('static::XS_ANY_ATTR_EXCLUSIONS')) {
+            return static::XS_ANY_ATTR_EXCLUSIONS;
         }
 
         return [];

src/XML/ExtendableElementTrait.php

@@ -45,7 +45,7 @@ protected static function getChildElementsFromXML(
         DOMElement $xml,
         string|array|null $namespace = null,
     ): array {
-        $namespace = $namespace ?? self::XS_ANY_ELT_NAMESPACE;
+        $namespace = $namespace ?? static::XS_ANY_ELT_NAMESPACE;
         $exclusionList = self::getElementExclusions();
         $registry = ElementRegistry::getInstance();
         $elements = [];
@@ -58,7 +58,11 @@ protected static function getChildElementsFromXML(
             foreach ($xml->childNodes as $elt) {
                 if (!($elt instanceof DOMElement)) {
                     continue;
-                } elseif (in_array([$elt->namespaceURI, $elt->localName], $exclusionList, true)) {
+                } elseif (
+                    $exclusionList
+                    && (in_array([$elt->namespaceURI, $elt->localName], $exclusionList, true)
+                        || in_array([$elt->namespaceURI, '*'], $exclusionList, true))
+                ) {
                     continue;
                 } elseif ($namespace === NS::OTHER && in_array($elt->namespaceURI, [self::NS, null], true)) {
                     continue;
@@ -205,13 +209,13 @@ public function getElements(): array
     public function getElementNamespace(): array|string
     {
         Assert::true(
-            defined('self::XS_ANY_ELT_NAMESPACE'),
+            defined('static::XS_ANY_ELT_NAMESPACE'),
             self::getClassName(self::class)
             . '::XS_ANY_ELT_NAMESPACE constant must be defined and set to the namespace for the xs:any element.',
             RuntimeException::class,
         );
 
-        return self::XS_ANY_ELT_NAMESPACE;
+        return static::XS_ANY_ELT_NAMESPACE;
     }
 
 
@@ -222,8 +226,8 @@ public function getElementNamespace(): array|string
      */
     public static function getElementExclusions(): array
     {
-        if (defined('self::XS_ANY_ELT_EXCLUSIONS')) {
-            return self::XS_ANY_ELT_EXCLUSIONS;
+        if (defined('static::XS_ANY_ELT_EXCLUSIONS')) {
+            return static::XS_ANY_ELT_EXCLUSIONS;
         }
 
         return [];

src/XMLSchema/XML/AbstractOpenAttrs.php

@@ -13,9 +13,6 @@
  */
 abstract class AbstractOpenAttrs extends AbstractAnyType
 {
-    /** The namespace-attribute for the xs:any element */
-    public const array XS_ANY_ELT_NAMESPACE = [];
-
     /** The namespace-attribute for the xs:anyAttribute element */
     public const string XS_ANY_ATTR_NAMESPACE = NS::OTHER;