#382 - Support for PHP namespaces in tag libraries.

neptuo · Dec 13, 2021 · a56735a · a56735a
1 parent 9bd8eef
commit a56735a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/app/scripts/php/classes/LibraryDefinition.class.php b/src/app/scripts/php/classes/LibraryDefinition.class.php
@@ -5,6 +5,7 @@
 
     class LibraryDefinition {
         private $prefix;
+        private $className;
         private $xmlPath;
         private $xml;
 
@@ -27,6 +28,17 @@ public function triggerFail($message, $errorType = E_USER_WARNING) {
             return false;
         }
 
+        public function getClassName() {
+            if (!$this->className) {
+                $this->className = basename($this->xmlPath, ".xml");
+                if ($this->xml->namespace) {
+                    $this->className = $this->xml->namespace . "\\" . $this->className;
+                }
+            }
+
+            return $this->className;
+        }
+
         public function isDisposable() {
             return isset($this->xml->disposable);
         }

diff --git a/src/app/scripts/php/libs/PhpRuntime.class.php b/src/app/scripts/php/libs/PhpRuntime.class.php
@@ -124,7 +124,7 @@ public function register($tagPrefix, $classPath, $params = []) {
                     $xmlPath = $this->libraryLoader->getXmlPath($classPath);
                     $library = $this->libraries->add($tagPrefix, $xmlPath);
                     if ($this->isCountOfInstances($classPath, $library)) {
-                        $className = $this->libraryLoader->getClassName($classPath);
+                        $className = $library->getClassName($classPath);
                         $GLOBALS[$tagPrefix . "Object"] = new $className($tagPrefix, $params);
                         $this->addInstanceToCounter($classPath);