diff --git a/tests/PHPUnit_Smarty.php b/tests/PHPUnit_Smarty.php index aa9bee8a..9c4b9275 100644 --- a/tests/PHPUnit_Smarty.php +++ b/tests/PHPUnit_Smarty.php @@ -379,7 +379,8 @@ KEY `expire` (`expire`) case 'mysql': return sha1($type . ':' . $name); case 'string': - return sha1($name); + $this->smarty->getTemplateDir(); + return sha1($name . $this->smarty->_joined_template_dir); default: throw new Exception("Unhandled source resource type '{$type}'"); } @@ -413,7 +414,8 @@ KEY `expire` (`expire`) case 'mysql': return sha1($type . ':' . $name); case 'string': - return sha1($name); + $this->smarty->getTemplateDir(); + return sha1($name . $this->smarty->_joined_template_dir); default: throw new Exception("Unhandled source resource type '{$type}'"); } diff --git a/tests/UnitTests/ResourceTests/String/StringResourceTest.php b/tests/UnitTests/ResourceTests/String/StringResourceTest.php index 28bf13b1..5baee6f9 100644 --- a/tests/UnitTests/ResourceTests/String/StringResourceTest.php +++ b/tests/UnitTests/ResourceTests/String/StringResourceTest.php @@ -56,7 +56,7 @@ class StringResourceTest extends PHPUnit_Smarty public function testGetTemplateFilepath() { $tpl = $this->smarty->createTemplate('string:hello world'); - $this->assertEquals('2aae6c35c94fcfb415dbe95f408b9ce91ee846ed', $tpl->source->filepath); + $this->assertEquals('f2611951e67556edb47cb258ac23fede8ba704bd', $tpl->source->filepath); } /**