From 538ffd3af2a9afddc7a8e4db917e1c7f4784d369 Mon Sep 17 00:00:00 2001 From: uwetews Date: Sun, 18 Oct 2015 03:33:17 +0200 Subject: [PATCH] Update forr 3.1.28 --- .../ResourceExtendsAllPluginTest.php | 2 +- ...bdf3032cafec4a8c_0.file.relativity.tpl.php | 30 ------------- .../BockExtend/CompileBlockExtendsTest.php | 2 +- ...a35dd8_0.file.021_grandchild.tpl.cache.php | 44 ------------------- tests/phpunit.xml | 3 +- 5 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 tests/UnitTests/ResourceTests/File/templates_c/431c052c4f3ffcf0b29a0853bdf3032cafec4a8c_0.file.relativity.tpl.php delete mode 100644 tests/UnitTests/TemplateSource/TagTests/BockExtend/templates_c/mustcompile/e910375493c61ffa81f68c2db217d88c56a35dd8_0.file.021_grandchild.tpl.cache.php diff --git a/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/ResourceExtendsAllPluginTest.php b/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/ResourceExtendsAllPluginTest.php index aaeb2bf8..37578418 100644 --- a/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/ResourceExtendsAllPluginTest.php +++ b/tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/ResourceExtendsAllPluginTest.php @@ -34,7 +34,7 @@ class ResourceExtendsAllPluginTest extends PHPUnit_Smarty './templates_4', )); - $expected = "templates\n templates_3\n templates\n\ntemplates_4"; + $expected = "templates\n\n templates_3\n templates\n\ntemplates_4"; $this->assertEquals($expected, $this->smarty->fetch('extendsall:extendsall.tpl')); } diff --git a/tests/UnitTests/ResourceTests/File/templates_c/431c052c4f3ffcf0b29a0853bdf3032cafec4a8c_0.file.relativity.tpl.php b/tests/UnitTests/ResourceTests/File/templates_c/431c052c4f3ffcf0b29a0853bdf3032cafec4a8c_0.file.relativity.tpl.php deleted file mode 100644 index 94eb7ae8..00000000 --- a/tests/UnitTests/ResourceTests/File/templates_c/431c052c4f3ffcf0b29a0853bdf3032cafec4a8c_0.file.relativity.tpl.php +++ /dev/null @@ -1,30 +0,0 @@ - -decodeProperties(array ( - 'has_nocache_code' => false, - 'version' => '3.1.28-dev/48', - 'unifunc' => 'content_55d9f41629daa8_36854466', - 'file_dependency' => - array ( - '431c052c4f3ffcf0b29a0853bdf3032cafec4a8c' => - array ( - 0 => 'C:\\wamp\\www\\Smarty3.1-test-release\\vendor\\smarty\\smarty-phpunit\\UnitTests\\ResourceTests\\File\\templates\\relativity\\relativity.tpl', - 1 => 1431983334, - 2 => 'file', - ), - ), - 'includes' => - array ( - ), -),false); -/*/%%SmartyHeaderCode%%*/ -if ($_valid && !is_callable('content_55d9f41629daa8_36854466')) { -function content_55d9f41629daa8_36854466 ($_smarty_tpl) { - -$_smarty_tpl->compiled->nocache_hash = '184755d9f416299867_60310907'; -?> -relativity \ No newline at end of file diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php index 1e66f5bc..17d8816c 100644 --- a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php +++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php @@ -552,7 +552,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty } /** - * @expectedException SmartyCompilerException + * @expectedException SmartyException * @expectedExceptionMessage tag {$smarty.block.parent} used in parent template * test {$this->smarty.block.parent} in parent template */ diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates_c/mustcompile/e910375493c61ffa81f68c2db217d88c56a35dd8_0.file.021_grandchild.tpl.cache.php b/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates_c/mustcompile/e910375493c61ffa81f68c2db217d88c56a35dd8_0.file.021_grandchild.tpl.cache.php deleted file mode 100644 index 0147fdf4..00000000 --- a/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates_c/mustcompile/e910375493c61ffa81f68c2db217d88c56a35dd8_0.file.021_grandchild.tpl.cache.php +++ /dev/null @@ -1,44 +0,0 @@ - -decodeProperties(array ( - 'has_nocache_code' => false, - 'version' => '3.1.28-dev/48', - 'unifunc' => 'content_55d9f43d2c6952_85477004', - 'file_dependency' => - array ( - 'e910375493c61ffa81f68c2db217d88c56a35dd8' => - array ( - 0 => 'C:\\wamp\\www\\Smarty3.1-test-release\\vendor\\smarty\\smarty-phpunit\\UnitTests\\TemplateSource\\TagTests\\BockExtend\\templates\\021_grandchild.tpl', - 1 => 1440347192, - 2 => 'file', - ), - '9dadb76e561d52673b400f87b15471be331b20cf' => - array ( - 0 => 'C:\\wamp\\www\\Smarty3.1-test-release\\vendor\\smarty\\smarty-phpunit\\UnitTests\\TemplateSource\\TagTests\\BockExtend\\templates\\021_child.tpl', - 1 => 1440347195, - 2 => 'file', - ), - '7c23e4563ca20b72f2b45ce0c4f3ec929d8084bc' => - array ( - 0 => 'C:\\wamp\\www\\Smarty3.1-test-release\\vendor\\smarty\\smarty-phpunit\\UnitTests\\TemplateSource\\TagTests\\BockExtend\\templates\\021_parent.tpl', - 1 => 1440347197, - 2 => 'file', - ), - ), - 'includes' => - array ( - ), -),false); -/*/%%SmartyHeaderCode%%*/ -if ($_valid && !is_callable('content_55d9f43d2c6952_85477004')) { -function content_55d9f43d2c6952_85477004 ($_smarty_tpl) { - -$_smarty_tpl->compiled->nocache_hash = '728455d9f43d295485_19027780'; -$_smarty_tpl->compiled->nocache_hash = '728455d9f43d295485_19027780'; -?> -Grandchild Page Title - \ No newline at end of file diff --git a/tests/phpunit.xml b/tests/phpunit.xml index b721df6e..249f0d4b 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -42,7 +42,6 @@ highlight="false" lowUpperBound="35" highLowerBound="70"/> - - +