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

Fix compiled templates' PSR-2 compliance.

Browse Source
This commit is contained in:
Justin Hileman
2013-01-26 16:34:16 -08:00
parent d5e199b3b9
commit c75b4c2e0b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mustache/Compiler.php
+8 -4
View File
@@ -148,7 +148,6 @@ class Mustache_Compiler
return $buffer; return $buffer;
} }
%s
}'; }';
/** /**
@@ -165,7 +164,7 @@ class Mustache_Compiler
$sections = implode("\n", $this->sections); $sections = implode("\n", $this->sections);
$klass = empty($this->sections) ? self::KLASS_NO_LAMBDAS : self::KLASS; $klass = empty($this->sections) ? self::KLASS_NO_LAMBDAS : self::KLASS;
return sprintf($this->prepare($klass, 0, false), $name, $code, $sections); return sprintf($this->prepare($klass, 0, false, true), $name, $code, $sections);
} }
const SECTION_CALL = ' const SECTION_CALL = '
@@ -174,7 +173,8 @@ class Mustache_Compiler
'; ';
const SECTION = ' const SECTION = '
private function section%s(Mustache_Context $context, $indent, $value) { private function section%s(Mustache_Context $context, $indent, $value)
{
$buffer = \'\'; $buffer = \'\';
if (!is_string($value) && is_callable($value)) { if (!is_string($value) && is_callable($value)) {
$source = %s; $source = %s;
@@ -377,15 +377,19 @@ class Mustache_Compiler
* @param string $text * @param string $text
* @param int $bonus Additional indent level (default: 0) * @param int $bonus Additional indent level (default: 0)
* @param boolean $prependNewline Prepend a newline to the snippet? (default: true) * @param boolean $prependNewline Prepend a newline to the snippet? (default: true)
* @param boolean $appendNewline Append a newline to the snippet? (default: false)
* *
* @return string PHP source code snippet * @return string PHP source code snippet
*/ */
private function prepare($text, $bonus = 0, $prependNewline = true) private function prepare($text, $bonus = 0, $prependNewline = true, $appendNewline = false)
{ {
$text = ($prependNewline ? "\n" : '').trim($text); $text = ($prependNewline ? "\n" : '').trim($text);
if ($prependNewline) { if ($prependNewline) {
$bonus++; $bonus++;
} }
if ($appendNewline) {
$text .= "\n";
}
return preg_replace("/\n( {8})?/", "\n".str_repeat(" ", $bonus * 4), $text); return preg_replace("/\n( {8})?/", "\n".str_repeat(" ", $bonus * 4), $text);
} }