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

Update extends test

Browse Source
This commit is contained in:
uwetews
2015-12-25 08:48:25 +01:00
parent 6b9648a1dc
commit 3d4fbb88c6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
View File

@@ -42,7 +42,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
$this->smarty->registerFilter('pre', array($this, 'compiledPrefilter'));
$this->smarty->assign('test', $testNumber);
$this->smarty->caching = $caching;
$this->smarty->inheritance_merge_compiled_includes = $merge;
$this->smarty->merge_compiled_includes = $merge;
if ($merge) {
$this->smarty->compile_id = 1;
}
@@ -61,7 +61,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
$this->smarty->registerFilter('pre', array($this, 'compiledPrefilter'));
$this->smarty->assign('test', $testNumber);
$this->smarty->caching = $caching;
$this->smarty->inheritance_merge_compiled_includes = $merge;
$this->smarty->merge_compiled_includes = $merge;
if ($merge) {
$this->smarty->compile_id = 1;
}
@@ -81,7 +81,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
$this->smarty->registerFilter('pre', array($this, 'compiledPrefilter'));
$this->smarty->assign('test', $testNumber);
$this->smarty->caching = $caching;
$this->smarty->inheritance_merge_compiled_includes = $merge;
$this->smarty->merge_compiled_includes = $merge;
if ($merge) {
$this->smarty->compile_id = 1;
}

2
tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
View File

@@ -642,7 +642,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
/**
* @expectedException SmartyException
* @expectedExceptionMessage tag {$smarty.block.parent} used in parent template
* @expectedExceptionMessage illegal {$smarty.block.parent}
* test {$this->smarty.block.parent} in parent template
*/
public function testSmartyBlockParentInParent_027()