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

Change entity_flags variable names to match PSR-2.

Browse Source
This commit is contained in:
Justin Hileman
2013-04-27 16:04:05 -07:00
parent 7065cef689
commit c5c36ddd2b
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mustache/Compiler.php
+5 -5
View File
@@ -21,7 +21,7 @@ class Mustache_Compiler
private $source; private $source;
private $indentNextLine; private $indentNextLine;
private $customEscape; private $customEscape;
private $entity_flags; private $entityFlags;
private $charset; private $charset;
private $strictCallables; private $strictCallables;
private $pragmas; private $pragmas;
@@ -33,20 +33,20 @@ class Mustache_Compiler
* @param string $tree Parse tree of Mustache tokens * @param string $tree Parse tree of Mustache tokens
* @param string $name Mustache Template class name * @param string $name Mustache Template class name
* @param bool $customEscape (default: false) * @param bool $customEscape (default: false)
* @param int $entity_flags (default: ENT_COMPAT) * @param int $entityFlags (default: ENT_COMPAT)
* @param string $charset (default: 'UTF-8') * @param string $charset (default: 'UTF-8')
* @param bool $strictCallables (default: false) * @param bool $strictCallables (default: false)
* *
* @return string Generated PHP source code * @return string Generated PHP source code
*/ */
public function compile($source, array $tree, $name, $customEscape = false, $charset = 'UTF-8', $strictCallables = false, $entity_flags = ENT_COMPAT) public function compile($source, array $tree, $name, $customEscape = false, $charset = 'UTF-8', $strictCallables = false, $entityFlags = ENT_COMPAT)
{ {
$this->pragmas = array(); $this->pragmas = array();
$this->sections = array(); $this->sections = array();
$this->source = $source; $this->source = $source;
$this->indentNextLine = true; $this->indentNextLine = true;
$this->customEscape = $customEscape; $this->customEscape = $customEscape;
$this->entity_flags = $entity_flags; $this->entityFlags = $entityFlags;
$this->charset = $charset; $this->charset = $charset;
$this->strictCallables = $strictCallables; $this->strictCallables = $strictCallables;
@@ -420,7 +420,7 @@ class Mustache_Compiler
if ($this->customEscape) { if ($this->customEscape) {
return sprintf(self::CUSTOM_ESCAPE, $value); return sprintf(self::CUSTOM_ESCAPE, $value);
} else { } else {
return sprintf(self::DEFAULT_ESCAPE, $value, var_export($this->entity_flags, true), var_export($this->charset, true)); return sprintf(self::DEFAULT_ESCAPE, $value, var_export($this->entityFlags, true), var_export($this->charset, true));
} }
} }
src/Mustache/Engine.php
+5 -5
View File
@@ -39,7 +39,7 @@ class Mustache_Engine
private $partialsLoader; private $partialsLoader;
private $helpers; private $helpers;
private $escape; private $escape;
private $entity_flags = ENT_COMPAT; private $entityFlags = ENT_COMPAT;
private $charset = 'UTF-8'; private $charset = 'UTF-8';
private $logger; private $logger;
private $strictCallables = false; private $strictCallables = false;
@@ -144,7 +144,7 @@ class Mustache_Engine
} }
if (isset($options['entity_flags'])) { if (isset($options['entity_flags'])) {
$this->entity_flags = $options['entity_flags']; $this->entityFlags = $options['entity_flags'];
} }
if (isset($options['charset'])) { if (isset($options['charset'])) {
@@ -195,7 +195,7 @@ class Mustache_Engine
*/ */
public function getEntityFlags() public function getEntityFlags()
{ {
return $this->entity_flags; return $this->entityFlags;
} }
/** /**
@@ -492,7 +492,7 @@ class Mustache_Engine
'version:%s,escape:%s,entity_flags:%i,charset:%s,strict_callables:%s,source:%s', 'version:%s,escape:%s,entity_flags:%i,charset:%s,strict_callables:%s,source:%s',
self::VERSION, self::VERSION,
isset($this->escape) ? 'custom' : 'default', isset($this->escape) ? 'custom' : 'default',
$this->entity_flags, $this->entityFlags,
$this->charset, $this->charset,
$this->strictCallables ? 'true' : 'false', $this->strictCallables ? 'true' : 'false',
$source $source
@@ -663,7 +663,7 @@ class Mustache_Engine
array('className' => $name) array('className' => $name)
); );
return $this->getCompiler()->compile($source, $tree, $name, isset($this->escape), $this->charset, $this->strictCallables, $this->entity_flags); return $this->getCompiler()->compile($source, $tree, $name, isset($this->escape), $this->charset, $this->strictCallables, $this->entityFlags);
} }
/** /**
test/Mustache/Test/CompilerTest.php
+2 -2
View File
@@ -18,11 +18,11 @@ class Mustache_Test_CompilerTest extends PHPUnit_Framework_TestCase
/** /**
* @dataProvider getCompileValues * @dataProvider getCompileValues
*/ */
public function testCompile($source, array $tree, $name, $customEscaper, $entity_flags, $charset, $expected) public function testCompile($source, array $tree, $name, $customEscaper, $entityFlags, $charset, $expected)
{ {
$compiler = new Mustache_Compiler; $compiler = new Mustache_Compiler;
$compiled = $compiler->compile($source, $tree, $name, $customEscaper, $charset, false, $entity_flags); $compiled = $compiler->compile($source, $tree, $name, $customEscaper, $charset, false, $entityFlags);
foreach ($expected as $contains) { foreach ($expected as $contains) {
$this->assertContains($contains, $compiled); $this->assertContains($contains, $compiled);
} }