From 5f8f92d75b396847568b8128b21394d92275a632 Mon Sep 17 00:00:00 2001 From: Uwe Tews Date: Wed, 1 Jul 2015 03:13:32 +0200 Subject: [PATCH] Update --- .../_shared/CacheResourceTestCommon.php | 2 +- .../ResourceTests/Eval/EvalResourceTest.php | 4 ++-- .../ResourceTests/File/FileResourceTest.php | 14 +++++++------- .../ResourceTests/Php/PhpResourceTest.php | 6 +++--- .../Registered/RegisteredResourceTest.php | 4 ++-- .../ResourcePlugins/ResourcePluginTest.php | 4 ++-- .../ResourceTests/Stream/StreamResourceTest.php | 4 ++-- .../ResourceTests/String/StringResourceTest.php | 4 ++-- .../TagTests/IncludePhp/CompileIncludePhpTest.php | 14 +++++++++++++- .../TagTests/IncludePhp/templates/include_php.tpl | 1 + .../IncludePhp/templates/include_php_trusted.tpl | 1 + 11 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php.tpl create mode 100644 tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php_trusted.tpl diff --git a/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php b/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php index e0ce6890..4d7c80d9 100644 --- a/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php +++ b/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php @@ -398,7 +398,7 @@ class CacheResourceTestCommon extends PHPUnit_Smarty } $tpl = $this->smarty->createTemplate('cacheresource.tpl', $this->smarty); if ($update) { - $this->assertEquals($t,$tpl->source->timestamp, $testName . ' - source touch'); + $this->assertEquals($t,$tpl->source->getTimeStamp(), $testName . ' - source touch'); } if ($lockTime) { $tpl->cached->handler->acquireLock($this->smarty, $tpl->cached); diff --git a/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php b/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php index b2d6df98..00051f74 100644 --- a/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php +++ b/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php @@ -52,7 +52,7 @@ class EvalResourceTest extends PHPUnit_Smarty public function testGetTemplateTimestamp() { $tpl = $this->smarty->createTemplate('eval:hello world'); - $this->assertFalse($tpl->source->timestamp); + $this->assertFalse($tpl->source->getTimeStamp()); } /** @@ -115,7 +115,7 @@ class EvalResourceTest extends PHPUnit_Smarty public function testGetCompiledTimestamp() { $tpl = $this->smarty->createTemplate('eval:hello world'); - $this->assertFalse($tpl->compiled->timestamp); + $this->assertFalse($tpl->compiled->getTimeStamp()); } /** diff --git a/tests/UnitTests/ResourceTests/File/FileResourceTest.php b/tests/UnitTests/ResourceTests/File/FileResourceTest.php index 0cbec86a..02f81e33 100644 --- a/tests/UnitTests/ResourceTests/File/FileResourceTest.php +++ b/tests/UnitTests/ResourceTests/File/FileResourceTest.php @@ -77,8 +77,8 @@ class FileResourceTest extends PHPUnit_Smarty public function testGetTemplateTimestamp() { $tpl = $this->smarty->createTemplate('helloworld.tpl'); - $this->assertTrue(is_integer($tpl->source->timestamp)); - $this->assertEquals(10, strlen($tpl->source->timestamp)); + $this->assertTrue(is_integer($tpl->source->getTimeStamp())); + $this->assertEquals(10, strlen($tpl->source->getTimeStamp())); } public function testGetTemplateSource() @@ -112,7 +112,7 @@ class FileResourceTest extends PHPUnit_Smarty $tpl = $this->smarty->createTemplate('helloworld.tpl'); // create dummy compiled file file_put_contents($tpl->compiled->filepath, ''); - touch($tpl->compiled->filepath, $tpl->source->timestamp); + touch($tpl->compiled->filepath, $tpl->source->getTimeStamp()); } /** @@ -121,9 +121,9 @@ class FileResourceTest extends PHPUnit_Smarty public function testGetCompiledTimestamp() { $tpl = $this->smarty->createTemplate('helloworld.tpl'); - $this->assertTrue(is_integer($tpl->compiled->timestamp)); - $this->assertEquals(10, strlen($tpl->compiled->timestamp)); - $this->assertEquals($tpl->compiled->timestamp, $tpl->source->timestamp); + $this->assertTrue(is_integer($tpl->compiled->getTimeStamp())); + $this->assertEquals(10, strlen($tpl->compiled->getTimeStamp())); + $this->assertEquals($tpl->compiled->getTimeStamp(), $tpl->source->getTimeStamp()); } public function testMustCompileExisting() @@ -378,7 +378,7 @@ class FileResourceTest extends PHPUnit_Smarty $this->_relativeMap($map); $this->smarty->setTemplateDir(array( - 'templates/relativity/theory/', + './templates/relativity/theory/', )); $map = array( diff --git a/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php b/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php index b2888a82..60a4cad1 100644 --- a/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php +++ b/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php @@ -45,8 +45,8 @@ class PhpResourceTest extends PHPUnit_Smarty public function testGetTemplateTimestamp() { $tpl = $this->smarty->createTemplate('php:phphelloworld.php'); - $this->assertTrue(is_integer($tpl->source->timestamp)); - $this->assertEquals(10, strlen($tpl->source->timestamp)); + $this->assertTrue(is_integer($tpl->source->getTimeStamp())); + $this->assertEquals(10, strlen($tpl->source->getTimeStamp())); } /** @@ -90,7 +90,7 @@ class PhpResourceTest extends PHPUnit_Smarty public function testGetCompiledTimestamp() { $tpl = $this->smarty->createTemplate('php:phphelloworld.php'); - $this->assertFalse($tpl->compiled->timestamp); + $this->assertFalse($tpl->compiled->getTimeStamp()); } /** diff --git a/tests/UnitTests/ResourceTests/Registered/RegisteredResourceTest.php b/tests/UnitTests/ResourceTests/Registered/RegisteredResourceTest.php index 41b32a76..a977329c 100644 --- a/tests/UnitTests/ResourceTests/Registered/RegisteredResourceTest.php +++ b/tests/UnitTests/ResourceTests/Registered/RegisteredResourceTest.php @@ -47,8 +47,8 @@ class RegisteredResourceTest extends PHPUnit_Smarty public function testResourcePluginTimestamp() { $tpl = $this->smarty->createTemplate('rr:test'); - $this->assertTrue(is_integer($tpl->source->timestamp)); - $this->assertEquals(10, strlen($tpl->source->timestamp)); + $this->assertTrue(is_integer($tpl->source->getTimeStamp())); + $this->assertEquals(10, strlen($tpl->source->getTimeStamp())); } /** diff --git a/tests/UnitTests/ResourceTests/ResourcePlugins/ResourcePluginTest.php b/tests/UnitTests/ResourceTests/ResourcePlugins/ResourcePluginTest.php index 2d071a29..fa896798 100644 --- a/tests/UnitTests/ResourceTests/ResourcePlugins/ResourcePluginTest.php +++ b/tests/UnitTests/ResourceTests/ResourcePlugins/ResourcePluginTest.php @@ -77,8 +77,8 @@ class ResourcePluginTest extends PHPUnit_Smarty { $this->smarty->addPluginsDir("./PHPunitplugins/"); $tpl = $this->smarty->createTemplate('db:test'); - $this->assertTrue(is_integer($tpl->source->timestamp)); - $this->assertEquals(10, strlen($tpl->source->timestamp)); + $this->assertTrue(is_integer($tpl->source->getTimeStamp())); + $this->assertEquals(10, strlen($tpl->source->getTimeStamp())); } } diff --git a/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php b/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php index 6f136403..80265550 100644 --- a/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php +++ b/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php @@ -51,7 +51,7 @@ class StreamResourceTest extends PHPUnit_Smarty public function testGetTemplateTimestamp() { $tpl = $this->smarty->createTemplate('global:mytest'); - $this->assertFalse($tpl->source->timestamp); + $this->assertFalse($tpl->source->getTimeStamp()); } /** @@ -105,7 +105,7 @@ class StreamResourceTest extends PHPUnit_Smarty public function testGetCompiledTimestamp() { $tpl = $this->smarty->createTemplate('global:mytest'); - $this->assertFalse($tpl->compiled->timestamp); + $this->assertFalse($tpl->compiled->getTimeStamp()); } /** diff --git a/tests/UnitTests/ResourceTests/String/StringResourceTest.php b/tests/UnitTests/ResourceTests/String/StringResourceTest.php index 0db0a255..db2269bc 100644 --- a/tests/UnitTests/ResourceTests/String/StringResourceTest.php +++ b/tests/UnitTests/ResourceTests/String/StringResourceTest.php @@ -63,7 +63,7 @@ class StringResourceTest extends PHPUnit_Smarty public function testGetTemplateTimestamp() { $tpl = $this->smarty->createTemplate('string:hello world'); - $this->assertEquals(0, $tpl->source->timestamp); + $this->assertEquals(0, $tpl->source->getTimeStamp()); } /** @@ -117,7 +117,7 @@ class StringResourceTest extends PHPUnit_Smarty public function testGetCompiledTimestamp() { $tpl = $this->smarty->createTemplate('string:hello world'); - $this->assertFalse($tpl->compiled->timestamp); + $this->assertFalse($tpl->compiled->getTimeStamp()); } /** diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/CompileIncludePhpTest.php b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/CompileIncludePhpTest.php index 0bda94c6..36c238c5 100644 --- a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/CompileIncludePhpTest.php +++ b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/CompileIncludePhpTest.php @@ -32,7 +32,19 @@ class CompileIncludePhpTest extends PHPUnit_Smarty public function testIncludePhpStringFileName() { $this->smartyBC->disableSecurity(); - $tpl = $this->smartyBC->createTemplate("eval:start {include_php file='scripts/test_include_php.php'} end"); + $tpl = $this->smartyBC->createTemplate('include_php.tpl'); + $result = $this->smartyBC->fetch($tpl); + $this->assertContains("test include php", $result); + } + + /** + * test include_php from trusted dir + */ + public function testIncludePhpTrusted() + { + $this->smartyBC->enableSecurity(); + $this->smartyBC->security_policy->trusted_dir = '.\\scripts\\'; + $tpl = $this->smartyBC->createTemplate('include_php_trusted.tpl'); $result = $this->smartyBC->fetch($tpl); $this->assertContains("test include php", $result); } diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php.tpl b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php.tpl new file mode 100644 index 00000000..f8fbe555 --- /dev/null +++ b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php.tpl @@ -0,0 +1 @@ +start {include_php file='scripts/test_include_php.php'} end diff --git a/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php_trusted.tpl b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php_trusted.tpl new file mode 100644 index 00000000..55c5865d --- /dev/null +++ b/tests/UnitTests/TemplateSource/TagTests/IncludePhp/templates/include_php_trusted.tpl @@ -0,0 +1 @@ +start {include_php file='test_include_php.php' once=false} end