From 911151ad78bbb830368445567069f443bd71370a Mon Sep 17 00:00:00 2001 From: Justin Hileman Date: Mon, 15 Jul 2013 18:08:24 -0400 Subject: [PATCH] =?UTF-8?q?Looks=20like=20we=20don=E2=80=99t=20need=20that?= =?UTF-8?q?=20rtrim()=20after=20all.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (+ a test, confirming) --- src/Mustache/Loader/FilesystemLoader.php | 4 ++-- test/Mustache/Test/Loader/FilesystemLoaderTest.php | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Mustache/Loader/FilesystemLoader.php b/src/Mustache/Loader/FilesystemLoader.php index d47d187..c30149c 100644 --- a/src/Mustache/Loader/FilesystemLoader.php +++ b/src/Mustache/Loader/FilesystemLoader.php @@ -49,8 +49,8 @@ class Mustache_Loader_FilesystemLoader implements Mustache_Loader { $this->baseDir = $baseDir; - if (strpos( $this->baseDir, '://' ) === -1) { - $this->baseDir = rtrim(realpath($this->baseDir), '/'); + if (strpos($this->baseDir, '://') === -1) { + $this->baseDir = realpath($this->baseDir); } if (!is_dir($this->baseDir)) { diff --git a/test/Mustache/Test/Loader/FilesystemLoaderTest.php b/test/Mustache/Test/Loader/FilesystemLoaderTest.php index 92b12f9..66027f0 100644 --- a/test/Mustache/Test/Loader/FilesystemLoaderTest.php +++ b/test/Mustache/Test/Loader/FilesystemLoaderTest.php @@ -22,6 +22,13 @@ class Mustache_Test_Loader_FilesystemLoaderTest extends PHPUnit_Framework_TestCa $this->assertEquals('beta contents', $loader->load('beta.ms')); } + public function testTrailingSlashes() + { + $baseDir = realpath(dirname(__FILE__).'/../../../fixtures/templates/'); + $loader = new Mustache_Loader_FilesystemLoader($baseDir); + $this->assertEquals('one contents', $loader->load('one')); + } + public function testLoadTemplates() { $baseDir = realpath(dirname(__FILE__).'/../../../fixtures/templates');