Merge pull request #17 from xp-forge/refactor/remove-deprecated-loader

Refactor/remove deprecated loader

Author: thekid

ChangeLog.md

@@ -5,6 +5,8 @@ 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/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/TemplateLoader.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/main/php/com/github/mustache/WithListing.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};
 
@@ -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')