Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up Tokenizer constants.

Browse Source 
Remove a bunch of hardcoded strings from everywhere.
This commit is contained in:
Justin Hileman
2012-03-05 14:25:32 -08:00
parent 36e7247b1e
commit a196ac8dab
6 changed files with 101 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Mustache/Test/CompilerTest.php
+3 -3
View File
@@ -50,11 +50,11 @@ class CompilerTest extends \PHPUnit_Framework_TestCase {
'foo',
"\n",
array(
Tokenizer::TAG => '_v',
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => 'name',
),
array(
Tokenizer::TAG => '_v',
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => '.',
),
"'bar'",
@@ -79,6 +79,6 @@ class CompilerTest extends \PHPUnit_Framework_TestCase {
*/
public function testCompilerThrowsUnknownNodeTypeException() {
$compiler = new Compiler;
$compiler->compile('', array(array(Tokenizer::TAG => 'invalid')), 'SomeClass');
$compiler->compile('', array(array(Tokenizer::TYPE => 'invalid')), 'SomeClass');
}
}
test/Mustache/Test/ParserTest.php
+26 -26
View File
@@ -43,11 +43,11 @@ class ParserTest extends \PHPUnit_Framework_TestCase {
array(
array(array(
Tokenizer::TAG => '_v',
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => 'name'
)),
array(array(
Tokenizer::TAG => '_v',
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => 'name'
)),
),
@@ -56,31 +56,31 @@ class ParserTest extends \PHPUnit_Framework_TestCase {
array(
'foo',
array(
Tokenizer::TAG => '^',
Tokenizer::TYPE => Tokenizer::T_INVERTED,
Tokenizer::INDEX => 123,
Tokenizer::NAME => 'parent'
Tokenizer::NAME => 'parent'
),
array(
Tokenizer::TAG => '_v',
Tokenizer::NAME => 'name'
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => 'name'
),
array(
Tokenizer::TAG => '/',
Tokenizer::TYPE => Tokenizer::T_END_SECTION,
Tokenizer::INDEX => 456,
Tokenizer::NAME => 'parent'
Tokenizer::NAME => 'parent'
),
'bar',
),
array(
'foo',
array(
Tokenizer::TAG => '^',
Tokenizer::NAME => 'parent',
Tokenizer::TYPE => Tokenizer::T_INVERTED,
Tokenizer::NAME => 'parent',
Tokenizer::INDEX => 123,
Tokenizer::END => 456,
Tokenizer::END => 456,
Tokenizer::NODES => array(
array(
Tokenizer::TAG => '_v',
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => 'name'
),
),
@@ -107,9 +107,9 @@ class ParserTest extends \PHPUnit_Framework_TestCase {
array(
array(
array(
Tokenizer::TAG => '#',
Tokenizer::TYPE => Tokenizer::T_SECTION,
Tokenizer::NAME => 'parent',
Tokenizer::INDEX => 123,
Tokenizer::NAME => 'parent'
),
),
),
@@ -118,9 +118,9 @@ class ParserTest extends \PHPUnit_Framework_TestCase {
array(
array(
array(
Tokenizer::TAG => '^',
Tokenizer::TYPE => Tokenizer::T_INVERTED,
Tokenizer::NAME => 'parent',
Tokenizer::INDEX => 123,
Tokenizer::NAME => 'parent'
),
),
),
@@ -129,9 +129,9 @@ class ParserTest extends \PHPUnit_Framework_TestCase {
array(
array(
array(
Tokenizer::TAG => '/',
Tokenizer::TYPE => Tokenizer::T_END_SECTION,
Tokenizer::NAME => 'parent',
Tokenizer::INDEX => 123,
Tokenizer::NAME => 'parent'
),
),
),
@@ -140,24 +140,24 @@ class ParserTest extends \PHPUnit_Framework_TestCase {
array(
array(
array(
Tokenizer::TAG => '#',
Tokenizer::TYPE => Tokenizer::T_SECTION,
Tokenizer::NAME => 'parent',
Tokenizer::INDEX => 123,
Tokenizer::NAME => 'parent'
),
array(
Tokenizer::TAG => '#',
Tokenizer::TYPE => Tokenizer::T_SECTION,
Tokenizer::NAME => 'child',
Tokenizer::INDEX => 123,
Tokenizer::NAME => 'child'
),
array(
Tokenizer::TAG => '/',
Tokenizer::TYPE => Tokenizer::T_END_SECTION,
Tokenizer::NAME => 'parent',
Tokenizer::INDEX => 123,
Tokenizer::NAME => 'parent'
),
array(
Tokenizer::TAG => '/',
Tokenizer::TYPE => Tokenizer::T_END_SECTION,
Tokenizer::NAME => 'child',
Tokenizer::INDEX => 123,
Tokenizer::NAME => 'child'
),
),
),
test/Mustache/Test/TokenizerTest.php
+7 -9
View File
@@ -45,7 +45,7 @@ class TokenizerTest extends \PHPUnit_Framework_TestCase {
null,
array(
array(
Tokenizer::TAG => '_v',
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => 'name',
Tokenizer::OTAG => '{{',
Tokenizer::CTAG => '}}',
@@ -65,7 +65,7 @@ class TokenizerTest extends \PHPUnit_Framework_TestCase {
'<<< >>>',
array(
array(
Tokenizer::TAG => '_v',
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => 'name',
Tokenizer::OTAG => '<<<',
Tokenizer::CTAG => '>>>',
@@ -79,7 +79,7 @@ class TokenizerTest extends \PHPUnit_Framework_TestCase {
null,
array(
array(
Tokenizer::TAG => '{',
Tokenizer::TYPE => Tokenizer::T_UNESCAPED,
Tokenizer::NAME => 'a',
Tokenizer::OTAG => '{{',
Tokenizer::CTAG => '}}',
@@ -87,7 +87,7 @@ class TokenizerTest extends \PHPUnit_Framework_TestCase {
),
"\n",
array(
Tokenizer::TAG => '#',
Tokenizer::TYPE => Tokenizer::T_SECTION,
Tokenizer::NAME => 'b',
Tokenizer::OTAG => '{{',
Tokenizer::CTAG => '}}',
@@ -95,14 +95,14 @@ class TokenizerTest extends \PHPUnit_Framework_TestCase {
),
null,
array(
Tokenizer::TAG => '_v',
Tokenizer::TYPE => Tokenizer::T_ESCAPED,
Tokenizer::NAME => 'c',
Tokenizer::OTAG => '|',
Tokenizer::CTAG => '|',
Tokenizer::INDEX => 37,
),
array(
Tokenizer::TAG => '/',
Tokenizer::TYPE => Tokenizer::T_END_SECTION,
Tokenizer::NAME => 'b',
Tokenizer::OTAG => '|',
Tokenizer::CTAG => '|',
@@ -110,7 +110,7 @@ class TokenizerTest extends \PHPUnit_Framework_TestCase {
),
"\n",
array(
Tokenizer::TAG => '{',
Tokenizer::TYPE => Tokenizer::T_UNESCAPED,
Tokenizer::NAME => 'd',
Tokenizer::OTAG => '|',
Tokenizer::CTAG => '|',
@@ -119,8 +119,6 @@ class TokenizerTest extends \PHPUnit_Framework_TestCase {
)
),
);
}
}