Better uses of NamespacesRegistry

Author: na2axl

src/AirBubble/Renderer/Template.php

@@ -41,6 +41,7 @@
 use ElementaryFramework\AirBubble\Util\OutputIndenter;
 use ElementaryFramework\AirBubble\Util\TemplateExtender;
 use ElementaryFramework\AirBubble\Util\Utilities;
+use ElementaryFramework\AirBubble\Util\NamespacesRegistry;
 
 /**
  * Template file
@@ -56,8 +57,6 @@
  */
 class Template implements IParser, IRenderer
 {
-    public const SCHEMA_URI = "http://bubble.na2axl.tk/schema";
-
     public const DATA_MODEL_QUERY_REGEX = "/\\\$\\{([a-zA-Z0-9,._\\(\\)\\[\\]'\" ]+)\\}/U";
 
     public const EXPRESSION_REGEX = "/\\{\\{(.+)\\}\\}/U";
@@ -181,7 +180,10 @@ private function _loadParser(Tokenizer $parser)
         $this->_tokensList->setTemplate($this);
 
         $this->_xPath = new \DOMXPath($this->_dom);
-        $this->_xPath->registerNamespace("b", self::SCHEMA_URI);
+
+        foreach (NamespacesRegistry::registry() as $ns => $uri) {
+            $this->_xPath->registerNamespace(rtrim($ns, ':'), $uri);
+        }
     }
 
     private function _processInclusions()

src/AirBubble/Util/NamespacesRegistry.php

@@ -66,7 +66,7 @@ abstract class NamespacesRegistry
      * @var array
      */
     private static $_registry = array(
-        "b:"  => Template::SCHEMA_URI
+        "b:"  => "http://bubble.na2axl.tk/schema"
     );
 
     /**

src/AirBubble/Util/TemplateExtender.php

@@ -34,6 +34,7 @@
 
 use ElementaryFramework\AirBubble\Renderer\Template;
 use ElementaryFramework\AirBubble\Data\DataResolver;
+use ElementaryFramework\AirBubble\Util\NamespacesRegistry;
 
 /**
  * Template Extender
@@ -96,7 +97,7 @@ public static function merge(string $parent, string $child): string
 
     private static function _processReplaces(\DOMDocument &$dom, array $blocks)
     {
-        $nodes = $dom->getElementsByTagNameNS(Template::SCHEMA_URI, "block");
+        $nodes = $dom->getElementsByTagNameNS(NamespacesRegistry::get("b:"), "block");
         $length = $nodes->length;
 
         foreach ($nodes as $node) {
@@ -106,7 +107,7 @@ private static function _processReplaces(\DOMDocument &$dom, array $blocks)
             }
         }
 
-        if ($dom->getElementsByTagNameNS(Template::SCHEMA_URI, "block")->length < $length) {
+        if ($dom->getElementsByTagNameNS(NamespacesRegistry::get("b:"), "block")->length < $length) {
             self::_processReplaces($dom, $blocks);
         }
     }

src/AirBubble/Util/Utilities.php

@@ -35,6 +35,7 @@
 use ElementaryFramework\AirBubble\AirBubble;
 use ElementaryFramework\AirBubble\Data\DataResolver;
 use ElementaryFramework\AirBubble\Renderer\Template;
+use ElementaryFramework\AirBubble\Util\NamespacesRegistry;
 
 /**
  * Utilities
@@ -83,7 +84,7 @@ public static function appendHTML(\DOMNode $parent, string $html)
     public static function insertHTMLBefore(string $html, \DOMNode $refNode)
     {
         $tmpDoc = new \DOMDocument();
-        $tmpDoc->loadXML("<wrapper xmlns:b=\"" . Template::SCHEMA_URI . "\">{$html}</wrapper>");
+        $tmpDoc->loadXML("<wrapper xmlns:b=\"" . NamespacesRegistry::get("b:") . "\">{$html}</wrapper>");
         foreach ($tmpDoc->documentElement->childNodes as $node) {
             $node = $refNode->ownerDocument->importNode($node, true);
             $refNode->parentNode->insertBefore($node, $refNode);