smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-03 18:04:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed getCachedContent

Browse Source
This commit is contained in:
Simon Wisselink
2023-01-24 12:09:47 +01:00
parent 9cc60f5e38
commit ecfa4bfa16
2 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Template.php
View File

@@ -420,7 +420,7 @@ class Template extends TemplateBase {
* @throws Exception * @throws Exception
*/ */
public function getCachedContent() { public function getCachedContent() {
return $this->getCachedContent($this); return $this->getCached()->handler->getCachedContent($this);
} }
/** /**
@@ -739,7 +739,7 @@ class Template extends TemplateBase {
$savedTplVars = $this->tpl_vars; $savedTplVars = $this->tpl_vars;
$savedConfigVars = $this->config_vars; $savedConfigVars = $this->config_vars;
// Start output-buffering. @TODO keep all ob_* calls together // Start output-buffering.
ob_start(); ob_start();
$result = $this->render(false, $function); $result = $this->render(false, $function);

156
tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php
View File

@@ -91,7 +91,7 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$this->smarty->cache_lifetime = 1000; $this->smarty->cache_lifetime = 1000;
$tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar'); $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
$tpl->writeCachedContent('hello world'); $tpl->writeCachedContent('hello world');
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
// Custom CacheResources may return -1 if they can't tell the number of deleted elements // Custom CacheResources may return -1 if they can't tell the number of deleted elements
//$this->assertEquals(-1, $this->smarty->clearAllCache()); //$this->assertEquals(-1, $this->smarty->clearAllCache());
} }
@@ -112,15 +112,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world 3'); $tpl3->writeCachedContent('hello world 3');
// test cached content // test cached content
$this->assertEquals('hello world 1', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world 1', $tpl->getCachedContent());
$this->assertEquals('hello world 2', $tpl2->getCachedContent($tpl2)); $this->assertEquals('hello world 2', $tpl2->getCachedContent());
$this->assertEquals('hello world 3', $tpl3->getCachedContent($tpl3)); $this->assertEquals('hello world 3', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(2, $this->smarty->clearCache(null, 'foo|bar')); $this->doClearCacheAssertion(2, $this->smarty->clearCache(null, 'foo|bar'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertNull($tpl->getCachedContent($tpl)); $this->assertNull($tpl->getCachedContent());
$this->assertEquals('hello world 2', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world 2', $tpl2->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl3)); $this->assertNull($tpl3->getCachedContent());
} }
public function testClearCacheCacheIdCompileId2() public function testClearCacheCacheIdCompileId2()
@@ -136,15 +136,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(2, $this->smarty->clearCache('helloworld.tpl')); $this->doClearCacheAssertion(2, $this->smarty->clearCache('helloworld.tpl'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertNull($tpl->getCachedContent($tpl)); $this->assertNull($tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
} }
public function testClearCacheCacheIdCompileId2Sub() public function testClearCacheCacheIdCompileId2Sub()
@@ -160,15 +160,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(2, $this->smarty->clearCache('helloworld.tpl')); $this->doClearCacheAssertion(2, $this->smarty->clearCache('helloworld.tpl'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertNull($tpl->getCachedContent($tpl)); $this->assertNull($tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
} }
public function testClearCacheCacheIdCompileId3() public function testClearCacheCacheIdCompileId3()
@@ -184,15 +184,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2')); $this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
} }
public function testClearCacheCacheIdCompileId3Sub() public function testClearCacheCacheIdCompileId3Sub()
@@ -208,15 +208,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2')); $this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
} }
public function testClearCacheCacheIdCompileId4() public function testClearCacheCacheIdCompileId4()
@@ -232,15 +232,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2')); $this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
} }
public function testClearCacheCacheIdCompileId4Sub() public function testClearCacheCacheIdCompileId4Sub()
@@ -256,15 +256,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2')); $this->doClearCacheAssertion(1, $this->smarty->clearCache('helloworld.tpl', null, 'blar2'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
} }
public function testClearCacheCacheIdCompileId5() public function testClearCacheCacheIdCompileId5()
@@ -280,15 +280,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(2, $this->smarty->clearCache(null, null, 'blar')); $this->doClearCacheAssertion(2, $this->smarty->clearCache(null, null, 'blar'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertNull($tpl->getCachedContent($tpl)); $this->assertNull($tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl3)); $this->assertNull($tpl3->getCachedContent());
} }
public function testClearCacheCacheIdCompileId5Sub() public function testClearCacheCacheIdCompileId5Sub()
@@ -304,15 +304,15 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar'); $tpl3 = $this->smarty->createTemplate('helloworld2.tpl', 'foo|bar', 'blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(2, $this->smarty->clearCache(null, null, 'blar')); $this->doClearCacheAssertion(2, $this->smarty->clearCache(null, null, 'blar'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertNull($tpl->getCachedContent($tpl)); $this->assertNull($tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl3)); $this->assertNull($tpl3->getCachedContent());
} }
public function testClearCacheCacheFile() public function testClearCacheCacheFile()
@@ -330,17 +330,17 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl4 = $this->smarty->createTemplate('helloworld2.tpl'); $tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
$tpl4->writeCachedContent('hello world'); $tpl4->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl4)); $this->assertEquals('hello world', $tpl4->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(3, $this->smarty->clearCache('helloworld.tpl')); $this->doClearCacheAssertion(3, $this->smarty->clearCache('helloworld.tpl'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertNull($tpl->getCachedContent($tpl)); $this->assertNull($tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl3)); $this->assertNull($tpl3->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl4)); $this->assertEquals('hello world', $tpl4->getCachedContent());
} }
/** /**
@@ -359,19 +359,19 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl3 = $this->smarty->createTemplate('helloworld.tpl', 'buh|blar'); $tpl3 = $this->smarty->createTemplate('helloworld.tpl', 'buh|blar');
$tpl3->writeCachedContent('hello world'); $tpl3->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
sleep(10); sleep(10);
$tpl4 = $this->smarty->createTemplate('helloworld2.tpl'); $tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
$tpl4->writeCachedContent('hello world'); $tpl4->writeCachedContent('hello world');
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(3,$this->smarty->clearAllCache(5)); $this->doClearCacheAssertion(3,$this->smarty->clearAllCache(5));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertNull($tpl->getCachedContent($tpl)); $this->assertNull($tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl3)); $this->assertNull($tpl3->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl4)); $this->assertEquals('hello world', $tpl4->getCachedContent());
} }
public function testClearCacheCacheFileSub() public function testClearCacheCacheFileSub()
@@ -389,17 +389,17 @@ abstract class CacheResourceTestCommon extends PHPUnit_Smarty
$tpl4 = $this->smarty->createTemplate('helloworld2.tpl'); $tpl4 = $this->smarty->createTemplate('helloworld2.tpl');
$tpl4->writeCachedContent('hello world'); $tpl4->writeCachedContent('hello world');
// test cached content // test cached content
$this->assertEquals('hello world', $tpl->getCachedContent($tpl)); $this->assertEquals('hello world', $tpl->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl2)); $this->assertEquals('hello world', $tpl2->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl3)); $this->assertEquals('hello world', $tpl3->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl4)); $this->assertEquals('hello world', $tpl4->getCachedContent());
// test number of deleted caches // test number of deleted caches
$this->doClearCacheAssertion(3, $this->smarty->clearCache('helloworld.tpl')); $this->doClearCacheAssertion(3, $this->smarty->clearCache('helloworld.tpl'));
// test that caches are deleted properly // test that caches are deleted properly
$this->assertNull($tpl->getCachedContent($tpl)); $this->assertNull($tpl->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl2)); $this->assertNull($tpl2->getCachedContent());
$this->assertNull($tpl->getCachedContent($tpl3)); $this->assertNull($tpl3->getCachedContent());
$this->assertEquals('hello world', $tpl->getCachedContent($tpl4)); $this->assertEquals('hello world', $tpl4->getCachedContent());
} }
/** /**
* Test caching * Test caching