From 8a6f2493c67fb07dfe7aec559660f0526a5e33bf Mon Sep 17 00:00:00 2001 From: Uwe Tews Date: Sun, 5 Nov 2017 20:40:46 +0100 Subject: [PATCH] Update exception messages 3.1.32-dev-33 --- .../TagTests/BlockPlugin/CompileBlockPluginTest.php | 5 +---- .../TagTests/BockExtend/CompileBlockExtendsTest.php | 8 ++++---- .../TemplateSource/TagTests/Php/CompilePhpTest.php | 2 +- .../TemplateSource/TagTests/_Attributes/AttributeTest.php | 4 ++-- .../TemplateSource/TagTests/_Error/CompileErrorTest.php | 2 +- .../ValueTests/DoubleQuoted/DoubleQuotedStringTest.php | 2 +- .../TemplateSource/ValueTests/Modifier/ModifierTest.php | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php index 062f365d..75439b99 100644 --- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php +++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php @@ -49,7 +49,7 @@ class CompileBlockPluginTest extends PHPUnit_Smarty * test unknown block plugin tag * * @expectedException SmartyCompilerException - * @expectedExceptionMessage unknown tag "bar" + * @expectedExceptionMessage unknown tag 'bar' * */ public function testBlockPluginUnknown() @@ -278,9 +278,6 @@ class CompileBlockPluginTest extends PHPUnit_Smarty { $this->smarty->registerFilter('pre', array($this, 'prefilterTest')); $this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'cachetest', 'myblockplugintest2', $cachable); - if ($testNumber == 13) { - $i = 0; - } $this->smarty->compile_id = $compileid; $this->smarty->caching = $caching; $this->smarty->cache_lifetime = 1000; diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php index 5bf78b95..16e4ce59 100644 --- a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php +++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php @@ -752,7 +752,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty /** * @expectedException SmartyCompilerException - * @expectedExceptionMessage "$smarty.block.child" used outside {block} tags + * @expectedExceptionMessage '$smarty.block.child' used outside {block} tags * test {$this->smarty.block.child} outside {block] */ public function testSmartyBlockChildOutsideBlock_025() @@ -762,7 +762,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty /** * @expectedException SmartyCompilerException - * @expectedExceptionMessage "$smarty.block.parent" used outside {block} tags + * @expectedExceptionMessage '$smarty.block.parent' used outside {block} tags * test {$this->smarty.block.parent} outside {block] */ public function testSmartyBlockParentOutsideBlock_026() @@ -998,7 +998,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty * test smarty.block.foo * * @expectedException SmartyCompilerException - * @expectedExceptionMessage invalid "$smarty.block.foo" expected "$smarty.block.child" or "$smarty.block.parent" + * @expectedExceptionMessage invalid '$smarty.block.foo' expected '$smarty.block.child' or '$smarty.block.parent' */ public function testSmartyBlockWrongBlockName_036() { @@ -1010,7 +1010,7 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty * test smarty.block * * @expectedException SmartyCompilerException - * @expectedExceptionMessage invalid "$smarty.block" expected "$smarty.block.child" or "$smarty.block.parent" + * @expectedExceptionMessage invalid '$smarty.block' expected '$smarty.block.child' or '$smarty.block.parent' */ public function testSmartyBlockMissigBlockName_037() { diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php index 14ec820a..08f98ee3 100644 --- a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php +++ b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php @@ -112,7 +112,7 @@ class CompilePhpTest extends PHPUnit_Smarty /** * test {php no cache}illegal option * @expectedException SmartyCompilerException - * @expectedExceptionMessage illegal value of option flag "no cache" + * @expectedExceptionMessage illegal value of option flag 'no cache' * */ public function testPHP_Tag_IllegalOption() diff --git a/tests/UnitTests/TemplateSource/TagTests/_Attributes/AttributeTest.php b/tests/UnitTests/TemplateSource/TagTests/_Attributes/AttributeTest.php index 185ddc95..b3fe851f 100644 --- a/tests/UnitTests/TemplateSource/TagTests/_Attributes/AttributeTest.php +++ b/tests/UnitTests/TemplateSource/TagTests/_Attributes/AttributeTest.php @@ -29,7 +29,7 @@ class AttributeTest extends PHPUnit_Smarty /** * @expectedException SmartyCompilerException - * @expectedExceptionMessage missing "var" attribute + * @expectedExceptionMessage missing 'var' attribute * test required attribute */ public function testRequiredAttributeVar() @@ -39,7 +39,7 @@ class AttributeTest extends PHPUnit_Smarty /** * @expectedException SmartyCompilerException - * @expectedExceptionMessage unexpected "bar" attribute + * @expectedExceptionMessage unexpected 'bar' attribute * test unexpected attribute */ public function testUnexpectedAttribute() diff --git a/tests/UnitTests/TemplateSource/TagTests/_Error/CompileErrorTest.php b/tests/UnitTests/TemplateSource/TagTests/_Error/CompileErrorTest.php index 7a00b131..b190c5ff 100644 --- a/tests/UnitTests/TemplateSource/TagTests/_Error/CompileErrorTest.php +++ b/tests/UnitTests/TemplateSource/TagTests/_Error/CompileErrorTest.php @@ -37,7 +37,7 @@ class CompileErrorTest extends PHPUnit_Smarty /** * @expectedException SmartyCompilerException - * @expectedExceptionMessage unknown tag "unknown" + * @expectedExceptionMessage unknown tag 'unknown' * test unkown tag error */ public function testUnknownTagError() diff --git a/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/DoubleQuotedStringTest.php b/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/DoubleQuotedStringTest.php index cf5eda23..19d010c8 100644 --- a/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/DoubleQuotedStringTest.php +++ b/tests/UnitTests/TemplateSource/ValueTests/DoubleQuoted/DoubleQuotedStringTest.php @@ -84,7 +84,7 @@ class DoubleQuotedStringTest extends PHPUnit_Smarty * test unclosed block tag * * @expectedException SmartyCompilerException - * @expectedExceptionMessage unclosed "{if}" in doubled quoted string + * @expectedExceptionMessage unclosed '{if}' in doubled quoted string */ public function testDoubleQuotedUnclosedBlock_001() { diff --git a/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php b/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php index 54f657b7..28e9d8f7 100644 --- a/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php +++ b/tests/UnitTests/TemplateSource/ValueTests/Modifier/ModifierTest.php @@ -96,7 +96,7 @@ class ModifierTest extends PHPUnit_Smarty /** * @expectedException SmartyCompilerException - * @expectedExceptionMessage unknown modifier "unknown" + * @expectedExceptionMessage unknown modifier 'unknown' * test unknown modifier error */ public function testUnknownModifier()