Merge pull request #38 from magento-research/bug/trim-templates

Trim Partial Templates

Author: bbatsche

src/Template/Mustache.php renamed to src/Template/Mustache/Engine.php

@@ -6,9 +6,11 @@
 
 declare(strict_types=1);
 
-namespace Magento\Upward\Template;
+namespace Magento\Upward\Template\Mustache;
 
-class Mustache implements TemplateInterface
+use Magento\Upward\Template\TemplateInterface;
+
+class Engine implements TemplateInterface
 {
     /**
      * @var \Mustache_Engine
@@ -18,7 +20,7 @@ class Mustache implements TemplateInterface
     public function __construct(string $basePath)
     {
         $this->mustacheEngine = new \Mustache_Engine([
-            'partials_loader' => new \Mustache_Loader_FilesystemLoader($basePath, ['extension' => 'mst']),
+            'partials_loader' => new FileLoader($basePath, ['extension' => 'mst']),
         ]);
     }
 

src/Template/Mustache/FileLoader.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Upward\Template\Mustache;
+
+class FileLoader extends \Mustache_Loader_FilesystemLoader
+{
+    protected function loadFile($name)
+    {
+        return trim(parent::loadFile($name));
+    }
+}

src/Template/TemplateFactory.php

@@ -8,6 +8,8 @@
 
 namespace Magento\Upward\Template;
 
+use Magento\Upward\Template\Mustache\Engine as MustacheEngine;
+
 class TemplateFactory
 {
     public const TEMPLATE_MUSTACHE = 'mustache';
@@ -16,7 +18,7 @@ class TemplateFactory
      * @var array map of template to renderer implementations
      */
     private static $templateClasses = [
-        self::TEMPLATE_MUSTACHE => Mustache::class,
+        self::TEMPLATE_MUSTACHE => MustacheEngine::class,
     ];
 
     /**

test/Template/MustacheTest.php renamed to test/Template/Mustache/EngineTest.php

@@ -6,21 +6,21 @@
 
 declare(strict_types=1);
 
-namespace Magento\Upward\Test\Template;
+namespace Magento\Upward\Test\Template\Mustache;
 
-use Magento\Upward\Template\Mustache;
+use Magento\Upward\Template\Mustache\Engine;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 use function BeBat\Verify\verify;
 
-class MustacheTest extends TestCase
+class EngineTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
     public function testRender(): void
     {
-        $mustacheEngine = new Mustache(__DIR__ . '/../_data');
+        $mustacheEngine = new Engine(__DIR__ . '/../../_data');
         verify($mustacheEngine->render('{{> templates/template}}', ['variable' => 'custom variable']))
-            ->will()->contain('<h1>A Mustache Template with a custom variable</h1>');
+            ->will()->sameAs('<h1>A Mustache Template with a custom variable</h1>');
     }
 }

test/Template/TemplateFactoryTest.php

@@ -8,7 +8,7 @@
 
 namespace Magento\Upward\Test\Template;
 
-use Magento\Upward\Template\Mustache;
+use Magento\Upward\Template\Mustache\Engine;
 use Magento\Upward\Template\TemplateFactory;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
@@ -20,7 +20,7 @@ class TemplateFactoryTest extends TestCase
 
     public function testGetWithEngine(): void
     {
-        verify(TemplateFactory::get(__DIR__, 'mustache'))->is()->instanceOf(Mustache::class);
+        verify(TemplateFactory::get(__DIR__, 'mustache'))->is()->instanceOf(Engine::class);
     }
 
     public function testGetWithInvalidEngine(): void
@@ -33,6 +33,6 @@ public function testGetWithInvalidEngine(): void
 
     public function testGetWithoutEngine(): void
     {
-        verify(TemplateFactory::get(__DIR__, null))->is()->instanceOf(Mustache::class);
+        verify(TemplateFactory::get(__DIR__, null))->is()->instanceOf(Engine::class);
     }
 }