Make compatible with xp-forge/mustache 9.0.0

Author: thekid

ChangeLog.md

@@ -3,6 +3,11 @@ HandleBars change log
 
 ## ?.?.? / ????-??-??
 
+* Refactored template loading to no longer use deprecated functionality
+  from the `xp-forge/mustache` library, making it compatible with its
+  newest major release
+  (@thekid)
+
 ## 9.5.0 / 2025-03-02
 
 * Merged PR #31: Make `withTemplates()` accept folder references and in-

composer.json

@@ -7,7 +7,7 @@
   "keywords": ["module", "xp"],
   "require" : {
     "xp-framework/core": "^12.0 | ^11.0 | ^10.0",
-    "xp-forge/mustache": "^8.2",
+    "xp-forge/mustache": "^9.0 | ^8.2",
     "xp-framework/logging": "^11.0 | ^10.0 | ^9.1",
     "php" : ">=7.0.0"
   },

src/main/php/com/handlebarsjs/Templates.class.php

@@ -1,16 +1,16 @@
 <?php namespace com\handlebarsjs;
 
-use com\github\mustache\templates\{Compiled, NotFound, Source, Tokens};
+use com\github\mustache\templates\{Compiled, NotFound, Source, InString, Templates as Base};
 use com\github\mustache\{Node, Template, TemplateListing};
 use lang\ClassLoader;
 use text\StringTokenizer;
 
 /**
  * Template loading implementation
  *
- * @test  xp://com.handlebarsjs.unittest.TemplatesTest
+ * @test  com.handlebarsjs.unittest.TemplatesTest
  */
-class Templates extends \com\github\mustache\templates\Templates {
+class Templates extends Base {
   private static $composite= null;
   private $templates= [];
   private $delegate;
@@ -42,7 +42,7 @@ public function register($name, $content) {
     } else if ($content instanceof Node) {
       $this->templates[$name]= new Compiled(new Template($name, $content));
     } else {
-      $this->templates[$name]= new Tokens($name, new StringTokenizer($content));
+      $this->templates[$name]= new InString($name, (string)$content);
     }
 
     return $previous;
@@ -56,7 +56,7 @@ public function register($name, $content) {
    * @return com.github.mustache.templates.Source
    */
   public function tokens($content, $name= '(string)') {
-    return new Tokens($name, new StringTokenizer((string)$content));
+    return new InString($name, (string)$content);
   }
 
   /**