From cb70b219adccdbb8467a7b6625f7cece21868a69 Mon Sep 17 00:00:00 2001 From: Uwe Tews Date: Wed, 1 Jul 2015 16:57:50 +0200 Subject: [PATCH] update $source->getContent() --- .../Custom/Ambiguous/CustomResourceAmbiguousTest.php | 8 ++++---- tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php | 2 +- tests/UnitTests/ResourceTests/File/FileResourceTest.php | 2 +- tests/UnitTests/ResourceTests/Php/PhpResourceTest.php | 2 +- .../UnitTests/ResourceTests/Stream/StreamResourceTest.php | 2 +- .../UnitTests/ResourceTests/String/StringResourceTest.php | 2 +- .../TemplateSource/TagTests/Php/CompilePhpTest.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php b/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php index c206664c..f627106d 100644 --- a/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php +++ b/tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php @@ -70,7 +70,7 @@ class CustomResourceAmbiguousTest extends PHPUnit_Smarty $tpl = $this->smarty->createTemplate('foobar.tpl'); $this->assertTrue($tpl->source->exists); - $this->assertEquals('case1', $tpl->source->content); + $this->assertEquals('case1', $tpl->source->getContent()); } /** @@ -90,7 +90,7 @@ class CustomResourceAmbiguousTest extends PHPUnit_Smarty $tpl = $this->smarty->createTemplate('foobar.tpl'); $this->assertTrue($tpl->source->exists); - $this->assertEquals('case2', $tpl->source->content); + $this->assertEquals('case2', $tpl->source->getContent()); } /** @@ -109,11 +109,11 @@ class CustomResourceAmbiguousTest extends PHPUnit_Smarty $resource_handler->setSegment('case1'); $tpl = $this->smarty->createTemplate('foobar.tpl'); $this->assertTrue($tpl->source->exists); - $this->assertEquals('case1', $tpl->source->content); + $this->assertEquals('case1', $tpl->source->getContent()); $resource_handler->setSegment('case2'); $tpl = $this->smarty->createTemplate('foobar.tpl'); $this->assertTrue($tpl->source->exists); - $this->assertEquals('case2', $tpl->source->content); + $this->assertEquals('case2', $tpl->source->getContent()); } } diff --git a/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php b/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php index 00051f74..68b8b99f 100644 --- a/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php +++ b/tests/UnitTests/ResourceTests/Eval/EvalResourceTest.php @@ -61,7 +61,7 @@ class EvalResourceTest extends PHPUnit_Smarty public function testGetTemplateSource() { $tpl = $this->smarty->createTemplate('eval:hello world{$foo}'); - $this->assertEquals('hello world{$foo}', $tpl->source->content); + $this->assertEquals('hello world{$foo}', $tpl->source->getContent()); } /** diff --git a/tests/UnitTests/ResourceTests/File/FileResourceTest.php b/tests/UnitTests/ResourceTests/File/FileResourceTest.php index 02f81e33..84bef22d 100644 --- a/tests/UnitTests/ResourceTests/File/FileResourceTest.php +++ b/tests/UnitTests/ResourceTests/File/FileResourceTest.php @@ -84,7 +84,7 @@ class FileResourceTest extends PHPUnit_Smarty public function testGetTemplateSource() { $tpl = $this->smarty->createTemplate('helloworld.tpl'); - $this->assertEquals('hello world', $tpl->source->content); + $this->assertEquals('hello world', $tpl->source->getContent()); } public function testUsesCompiler() diff --git a/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php b/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php index 60a4cad1..574cb469 100644 --- a/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php +++ b/tests/UnitTests/ResourceTests/Php/PhpResourceTest.php @@ -55,7 +55,7 @@ class PhpResourceTest extends PHPUnit_Smarty * public function testGetTemplateSource() * { * $tpl = $this->smarty->createTemplate('php:phphelloworld.php'); - * $this->assertContains('php hello world', $tpl->source->content); + * $this->assertContains('php hello world', $tpl->source->getContent()); * } * /** * test usesCompiler diff --git a/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php b/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php index 80265550..3cbb58ff 100644 --- a/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php +++ b/tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php @@ -60,7 +60,7 @@ class StreamResourceTest extends PHPUnit_Smarty public function testGetTemplateSource() { $tpl = $this->smarty->createTemplate('global:mytest', null, null, $this->smarty); - $this->assertEquals('hello world {$foo}', $tpl->source->content); + $this->assertEquals('hello world {$foo}', $tpl->source->getContent()); } /** diff --git a/tests/UnitTests/ResourceTests/String/StringResourceTest.php b/tests/UnitTests/ResourceTests/String/StringResourceTest.php index db2269bc..cae2f60c 100644 --- a/tests/UnitTests/ResourceTests/String/StringResourceTest.php +++ b/tests/UnitTests/ResourceTests/String/StringResourceTest.php @@ -72,7 +72,7 @@ class StringResourceTest extends PHPUnit_Smarty public function testGetTemplateSource() { $tpl = $this->smarty->createTemplate('string:hello world{$foo}'); - $this->assertEquals('hello world{$foo}', $tpl->source->content); + $this->assertEquals('hello world{$foo}', $tpl->source->getContent()); } /** diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php index f2f84aaa..0dfcbbcb 100644 --- a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php +++ b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php @@ -43,7 +43,7 @@ class CompilePhpTest extends PHPUnit_Smarty $this->smartyBC->compile_id = $testName; $tpl = $this->smartyBC->createTemplate($templateFile); if ($phpHandling == Smarty::PHP_PASSTHRU || $phpHandling == Smarty::PHP_QUOTE) { - $result = str_replace("\r", '', $tpl->source->content); + $result = str_replace("\r", '', $tpl->source->getContent()); } if ($phpHandling == Smarty::PHP_QUOTE) { $result = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|()|(\?>)|(%>)|(<\/script>)#i', array($this, 'quote'), $result);