Refactor/remove deprecated loader

ChangeLog.md

@@ -3,6 +3,10 @@ Mustache for XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 9.0.0 / 2025-05-04
+
+**Heads up:** Remove deprecated template loader infrastructure, see #8
+  (@thekid)
 **Heads up:** Dropped support for PHP < 7.4, see xp-framework/rfc#343
   (@thekid)
 * Added PHP 8.5 to test matrix - @thekid

src/main/php/com/github/mustache/Context.class.php

@@ -64,9 +64,7 @@ protected function helper($ptr, $segment) {
       return $ptr;
     } else if (is_object($ptr)) {
       return method_exists($ptr, $segment)
-        ? function($in, $ctx, $options) use($ptr, $segment) {
-            return $ptr->$segment($in, $ctx, $options);
-          }
+        ? fn($in, $ctx, $options) => $ptr->$segment($in, $ctx, $options)
         : null
       ;
     } else {

src/main/php/com/github/mustache/MustacheEngine.class.php

@@ -1,6 +1,6 @@
 <?php namespace com\github\mustache;
 
-use com\github\mustache\templates\{FromLoader, Source, Templates};
+use com\github\mustache\templates\{Source, Templates};
 use text\StringTokenizer;
 
 /**
@@ -15,12 +15,12 @@
  * ]);
  * ```
  *
- * @test xp://com.github.mustache.unittest.EngineTest
- * @test xp://com.github.mustache.unittest.RenderingTest
- * @test xp://com.github.mustache.unittest.HelpersTest
- * @test xp://com.github.mustache.unittest.SpecificationTest
- * @see  https://github.com/mustache/spec
- * @see  http://mustache.github.io/mustache.5.html
+ * @see   https://github.com/mustache/spec
+ * @see   http://mustache.github.io/mustache.5.html
+ * @test  com.github.mustache.unittest.EngineTest
+ * @test  com.github.mustache.unittest.RenderingTest
+ * @test  com.github.mustache.unittest.HelpersTest
+ * @test  com.github.mustache.unittest.SpecificationTest
  */
 class MustacheEngine {
   protected $templates, $parser;
@@ -37,15 +37,11 @@ public function __construct() {
   /**
    * Sets template loader to be used
    *
-   * @param  com.github.mustache.templates.Templates|com.github.mustache.TemplateLoader $l
+   * @param  com.github.mustache.templates.Templates $l
    * @return self this
    */
-  public function withTemplates($l) {
-    if ($l instanceof Templates) {
-      $this->templates= $l;
-    } else {
-      $this->templates= new FromLoader($l);
-    }
+  public function withTemplates(Templates $l) {
+    $this->templates= $l;
     return $this;
   }
 

src/main/php/com/github/mustache/templates/Templates.class.php

@@ -1,16 +1,14 @@
 <?php namespace com\github\mustache\templates;
 
-use com\github\mustache\{TemplateLoader, WithListing};
 use io\streams\MemoryInputStream;
 
 /**
  * Template loading
  *
- * @test  xp://com.github.mustache.unittest.InMemoryTest
- * @test  xp://com.github.mustache.unittest.FileBasedTemplateLoaderTest
- * @test  xp://com.github.mustache.unittest.DeprecatedLoaderFunctionalityTest
+ * @test  com.github.mustache.unittest.InMemoryTest
+ * @test  com.github.mustache.unittest.FileBasedTemplateLoaderTest
  */
-abstract class Templates implements TemplateLoader, WithListing {
+abstract class Templates {
 
   /**
    * Load a template by a given name

src/test/php/com/github/mustache/unittest/EngineTest.class.php

@@ -1,6 +1,6 @@
 <?php namespace com\github\mustache\unittest;
 
-use com\github\mustache\{FilesIn, MustacheEngine, MustacheParser, NodeList, Template, TemplateLoader, TextNode, VariableNode};
+use com\github\mustache\{FilesIn, InMemory, MustacheEngine, MustacheParser, NodeList, Template, TextNode, VariableNode};
 use io\streams\{MemoryInputStream, MemoryOutputStream};
 use test\{Assert, Test};
 
@@ -32,7 +32,7 @@ public function withHelpers_returns_engine() {
   #[Test]
   public function withHelper_returns_engine() {
     $engine= new MustacheEngine();
-    $helper= function($text) { return '<b>'.$text.'</b>'; };
+    $helper= fn($text) => '<b>'.$text.'</b>';
     Assert::equals($engine, $engine->withHelper('bold', $helper));
   }
 
@@ -50,7 +50,7 @@ public function helpers_initially_empty() {
 
   #[Test]
   public function helpers_returns_aded_helper() {
-    $helper= function($text) { return '<b>'.$text.'</b>'; };
+    $helper= fn($text) => '<b>'.$text.'</b>';
     $engine= (new MustacheEngine())->withHelper('bold', $helper);
     Assert::equals(['bold' => $helper], $engine->helpers);
   }
@@ -65,11 +65,7 @@ public function compile_template() {
 
   #[Test]
   public function load_template() {
-    $loader= newinstance(TemplateLoader::class, [], [
-      'load' => function($name) {
-        return new MemoryInputStream('Hello {{name}}');
-      }
-    ]);
+    $loader= new InMemory(['test' => 'Hello {{name}}']);
     Assert::equals(
       new Template('test', new NodeList([new TextNode('Hello '), new VariableNode('name')])),
       (new MustacheEngine())->withTemplates($loader)->load('test')

src/test/php/com/github/mustache/unittest/HelpersTest.class.php

@@ -2,6 +2,7 @@
 
 use com\github\mustache\{MustacheEngine, VariableNode};
 use test\{Assert, Test};
+use util\Date;
 
 class HelpersTest {
 
@@ -25,7 +26,7 @@ public function replace_single_variable() {
     Assert::equals(
       'Hello <b>World</b>',
       $this->render('Hello {{#bold}}{{name}}{{/bold}}', ['name' => 'World'], [
-        'bold' => function($text) { return '<b>'.$text.'</b>'; }
+        'bold' => fn($text) => '<b>'.$text.'</b>'
       ])
     );
   }
@@ -35,7 +36,7 @@ public function replace_single_variable_with_node() {
     Assert::equals(
       'Hello World',
       $this->render('Hello {{#var}}name{{/var}}', ['name' => 'World'], [
-        'var' => function($in) { return new VariableNode((string)$in); }
+        'var' => fn($in) => new VariableNode((string)$in)
       ])
     );
   }
@@ -46,8 +47,8 @@ public function dot_notation() {
       'Hello world, this is BIG',
       $this->render('Hello {{#case.lower}}World{{/case.lower}}, this is {{#case.upper}}big{{/case.upper}}', [], [
         'case' => [
-          'lower' => function($text) { return strtolower($text); },
-          'upper' => function($text) { return strtoupper($text); }
+          'lower' => fn($text) => strtolower($text),
+          'upper' => fn($text) => strtoupper($text)
         ]
       ])
     );
@@ -71,7 +72,7 @@ public function instance_method_as_helper() {
       'My birthday @ 14.12.2013',
       $this->render(
         'My birthday @ {{#format.date}}{{date}}{{/format.date}}',
-        ['date' => new \util\Date('14.12.2013 00:00:00')],
+        ['date'   => new Date('14.12.2013 00:00:00')],
         ['format' => new class() extends Value {
           public function date($in, $context, $options) {
             return $context->lookup($in->nodeAt(0)->name())->toString("d.m.Y");
@@ -86,9 +87,7 @@ public function log_section() {
     Assert::equals(
       'Hello [logged: info "Just a test"]',
       $this->render('Hello {{#log info}}Just a test{{/log}}', [], [
-        'log' => function($in, $context, $options) {
-          return '[logged: '.$options[0].' "'.$in.'"]';
-        }
+        'log' => fn($in, $context, $options) => '[logged: '.$options[0].' "'.$in.'"]'
       ])
     );
   }
@@ -98,9 +97,7 @@ public function log_helper() {
     Assert::equals(
       'Hello [logged: info Just a test]',
       $this->render('Hello {{log info "Just a test"}}', [], [
-        'log' => function($in, $context, $options) {
-          return '[logged: '.implode(' ', $options).']';
-        }
+        'log' => fn($in, $context, $options) => '[logged: '.implode(' ', $options).']'
       ])
     );
   }

src/test/php/com/github/mustache/unittest/ParserExtendingTest.class.php

@@ -1,8 +1,8 @@
 <?php namespace com\github\mustache\unittest;
 
 use com\github\mustache\{MustacheParser, Node, NodeList};
-use text\StringTokenizer;
 use test\{Assert, Test, TestCase};
+use text\StringTokenizer;
 
 class ParserExtendingTest {