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

concatenation with spaces around

Browse Source
This commit is contained in:
Dariusz Rumiński
2014-09-06 01:21:20 +02:00
parent c2a39e0f13
commit 1319f0486d
11 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mustache/Autoloader.php
+1 -1
View File
@@ -24,7 +24,7 @@ class Mustache_Autoloader
public function __construct($baseDir = null) public function __construct($baseDir = null)
{ {
if ($baseDir === null) { if ($baseDir === null) {
$baseDir = dirname(__FILE__).'/..'; $baseDir = dirname(__FILE__) . '/..';
} }
// realpath doesn't always work, for example, with stream URIs // realpath doesn't always work, for example, with stream URIs
src/Mustache/Compiler.php
+4 -4
View File
@@ -341,12 +341,12 @@ class Mustache_Compiler
$callable = $this->getCallable(); $callable = $this->getCallable();
if ($otag !== '{{' || $ctag !== '}}') { if ($otag !== '{{' || $ctag !== '}}') {
$delims = ', '.var_export(sprintf('{{= %s %s =}}', $otag, $ctag), true); $delims = ', ' . var_export(sprintf('{{= %s %s =}}', $otag, $ctag), true);
} else { } else {
$delims = ''; $delims = '';
} }
$key = ucfirst(md5($delims."\n".$source)); $key = ucfirst(md5($delims . "\n" . $source));
if (!isset($this->sections[$key])) { if (!isset($this->sections[$key])) {
$this->sections[$key] = sprintf($this->prepare(self::SECTION), $key, $callable, $source, $delims, $this->walk($nodes, 2)); $this->sections[$key] = sprintf($this->prepare(self::SECTION), $key, $callable, $source, $delims, $this->walk($nodes, 2));
@@ -552,7 +552,7 @@ class Mustache_Compiler
*/ */
private function prepare($text, $bonus = 0, $prependNewline = true, $appendNewline = false) 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++;
} }
@@ -560,7 +560,7 @@ class Mustache_Compiler
$text .= "\n"; $text .= "\n";
} }
return preg_replace("/\n( {8})?/", "\n".str_repeat(" ", $bonus * 4), $text); return preg_replace("/\n( {8})?/", "\n" . str_repeat(" ", $bonus * 4), $text);
} }
const DEFAULT_ESCAPE = 'htmlspecialchars(%s, %s, %s)'; const DEFAULT_ESCAPE = 'htmlspecialchars(%s, %s, %s)';
src/Mustache/Tokenizer.php
+1 -1
View File
@@ -252,7 +252,7 @@ class Mustache_Tokenizer
private function changeDelimiters($text, $index) private function changeDelimiters($text, $index)
{ {
$startIndex = strpos($text, '=', $index) + 1; $startIndex = strpos($text, '=', $index) + 1;
$close = '='.$this->ctag; $close = '=' . $this->ctag;
$closeIndex = strpos($text, $close, $index); $closeIndex = strpos($text, $close, $index);
$this->setDelimiters(trim(substr($text, $startIndex, $closeIndex - $startIndex))); $this->setDelimiters(trim(substr($text, $startIndex, $closeIndex - $startIndex)));
test/Mustache/Test/AutoloaderTest.php
+1 -1
View File
@@ -22,7 +22,7 @@ class Mustache_Test_AutoloaderTest extends PHPUnit_Framework_TestCase
public function testAutoloader() public function testAutoloader()
{ {
$loader = new Mustache_Autoloader(dirname(__FILE__).'/../../fixtures/autoloader'); $loader = new Mustache_Autoloader(dirname(__FILE__) . '/../../fixtures/autoloader');
$this->assertNull($loader->autoload('NonMustacheClass')); $this->assertNull($loader->autoload('NonMustacheClass'));
$this->assertFalse(class_exists('NonMustacheClass')); $this->assertFalse(class_exists('NonMustacheClass'));
test/Mustache/Test/CompilerTest.php
+3 -3
View File
@@ -76,7 +76,7 @@ class Mustache_Test_CompilerTest extends PHPUnit_Framework_TestCase
array( array(
"\nclass Monkey extends Mustache_Template", "\nclass Monkey extends Mustache_Template",
'$value = $this->resolveValue($context->find(\'name\'), $context, $indent);', '$value = $this->resolveValue($context->find(\'name\'), $context, $indent);',
'$buffer .= $indent . htmlspecialchars($value, '.ENT_COMPAT.', \'ISO-8859-1\');', '$buffer .= $indent . htmlspecialchars($value, ' . ENT_COMPAT . ', \'ISO-8859-1\');',
'return $buffer;', 'return $buffer;',
) )
), ),
@@ -96,7 +96,7 @@ class Mustache_Test_CompilerTest extends PHPUnit_Framework_TestCase
array( array(
"\nclass Monkey extends Mustache_Template", "\nclass Monkey extends Mustache_Template",
'$value = $this->resolveValue($context->find(\'name\'), $context, $indent);', '$value = $this->resolveValue($context->find(\'name\'), $context, $indent);',
'$buffer .= $indent . htmlspecialchars($value, '.ENT_QUOTES.', \'ISO-8859-1\');', '$buffer .= $indent . htmlspecialchars($value, ' . ENT_QUOTES . ', \'ISO-8859-1\');',
'return $buffer;', 'return $buffer;',
) )
), ),
@@ -123,7 +123,7 @@ class Mustache_Test_CompilerTest extends PHPUnit_Framework_TestCase
"\nclass Monkey extends Mustache_Template", "\nclass Monkey extends Mustache_Template",
"\$buffer .= \$indent . 'foo\n';", "\$buffer .= \$indent . 'foo\n';",
'$value = $this->resolveValue($context->find(\'name\'), $context, $indent);', '$value = $this->resolveValue($context->find(\'name\'), $context, $indent);',
'$buffer .= htmlspecialchars($value, '.ENT_COMPAT.', \'UTF-8\');', '$buffer .= htmlspecialchars($value, ' . ENT_COMPAT . ', \'UTF-8\');',
'$value = $this->resolveValue($context->last(), $context, $indent);', '$value = $this->resolveValue($context->last(), $context, $indent);',
'$buffer .= \'\\\'bar\\\'\';', '$buffer .= \'\\\'bar\\\'\';',
'return $buffer;', 'return $buffer;',
test/Mustache/Test/EngineTest.php
+1 -1
View File
@@ -237,7 +237,7 @@ class Mustache_Test_EngineTest extends Mustache_Test_FunctionalTestCase
public static function wrapWithUnderscores($text) public static function wrapWithUnderscores($text)
{ {
return '__'.$text.'__'; return '__' . $text . '__';
} }
/** /**
test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
+1 -1
View File
@@ -23,7 +23,7 @@ class Mustache_Test_FiveThree_Functional_MustacheSpecTest extends Mustache_Test_
*/ */
public function testSpecInitialized() public function testSpecInitialized()
{ {
if (!file_exists(dirname(__FILE__).'/../../../../../vendor/spec/specs/')) { if (!file_exists(dirname(__FILE__) . '/../../../../../vendor/spec/specs/')) {
$this->markTestSkipped('Mustache spec submodule not initialized: run "git submodule update --init"'); $this->markTestSkipped('Mustache spec submodule not initialized: run "git submodule update --init"');
} }
} }
test/Mustache/Test/Functional/ExamplesTest.php
+4 -4
View File
@@ -46,7 +46,7 @@ class Mustache_Test_Functional_ExamplesTest extends PHPUnit_Framework_TestCase
*/ */
public function getExamples() public function getExamples()
{ {
$path = realpath(dirname(__FILE__).'/../../../fixtures/examples'); $path = realpath(dirname(__FILE__) . '/../../../fixtures/examples');
$examples = array(); $examples = array();
$handle = opendir($path); $handle = opendir($path);
@@ -55,7 +55,7 @@ class Mustache_Test_Functional_ExamplesTest extends PHPUnit_Framework_TestCase
continue; continue;
} }
$fullpath = $path.'/'.$file; $fullpath = $path . '/' . $file;
if (is_dir($fullpath)) { if (is_dir($fullpath)) {
$examples[$file] = $this->loadExample($fullpath); $examples[$file] = $this->loadExample($fullpath);
} }
@@ -81,7 +81,7 @@ class Mustache_Test_Functional_ExamplesTest extends PHPUnit_Framework_TestCase
$handle = opendir($path); $handle = opendir($path);
while (($file = readdir($handle)) !== false) { while (($file = readdir($handle)) !== false) {
$fullpath = $path.'/'.$file; $fullpath = $path . '/' . $file;
$info = pathinfo($fullpath); $info = pathinfo($fullpath);
if (is_dir($fullpath) && $info['basename'] == 'partials') { if (is_dir($fullpath) && $info['basename'] == 'partials') {
@@ -128,7 +128,7 @@ class Mustache_Test_Functional_ExamplesTest extends PHPUnit_Framework_TestCase
continue; continue;
} }
$fullpath = $path.'/'.$file; $fullpath = $path . '/' . $file;
$info = pathinfo($fullpath); $info = pathinfo($fullpath);
if ($info['extension'] === 'mustache') { if ($info['extension'] === 'mustache') {
test/Mustache/Test/Functional/MustacheSpecTest.php
+1 -1
View File
@@ -23,7 +23,7 @@ class Mustache_Test_Functional_MustacheSpecTest extends Mustache_Test_SpecTestCa
*/ */
public function testSpecInitialized() public function testSpecInitialized()
{ {
if (!file_exists(dirname(__FILE__).'/../../../../vendor/spec/specs/')) { if (!file_exists(dirname(__FILE__) . '/../../../../vendor/spec/specs/')) {
$this->markTestSkipped('Mustache spec submodule not initialized: run "git submodule update --init"'); $this->markTestSkipped('Mustache spec submodule not initialized: run "git submodule update --init"');
} }
} }
test/Mustache/Test/FunctionalTestCase.php
+2 -2
View File
@@ -26,14 +26,14 @@ abstract class Mustache_Test_FunctionalTestCase extends PHPUnit_Framework_TestCa
*/ */
protected static function rmdir($path) protected static function rmdir($path)
{ {
$path = rtrim($path, '/').'/'; $path = rtrim($path, '/') . '/';
$handle = opendir($path); $handle = opendir($path);
while (($file = readdir($handle)) !== false) { while (($file = readdir($handle)) !== false) {
if ($file == '.' || $file == '..') { if ($file == '.' || $file == '..') {
continue; continue;
} }
$fullpath = $path.$file; $fullpath = $path . $file;
if (is_dir($fullpath)) { if (is_dir($fullpath)) {
self::rmdir($fullpath); self::rmdir($fullpath);
} else { } else {
test/Mustache/Test/Loader/FilesystemLoaderTest.php
+7 -7
View File
@@ -16,7 +16,7 @@ class Mustache_Test_Loader_FilesystemLoaderTest extends PHPUnit_Framework_TestCa
{ {
public function testConstructor() public function testConstructor()
{ {
$baseDir = realpath(dirname(__FILE__).'/../../../fixtures/templates'); $baseDir = realpath(dirname(__FILE__) . '/../../../fixtures/templates');
$loader = new Mustache_Loader_FilesystemLoader($baseDir, array('extension' => '.ms')); $loader = new Mustache_Loader_FilesystemLoader($baseDir, array('extension' => '.ms'));
$this->assertEquals('alpha contents', $loader->load('alpha')); $this->assertEquals('alpha contents', $loader->load('alpha'));
$this->assertEquals('beta contents', $loader->load('beta.ms')); $this->assertEquals('beta contents', $loader->load('beta.ms'));
@@ -24,14 +24,14 @@ class Mustache_Test_Loader_FilesystemLoaderTest extends PHPUnit_Framework_TestCa
public function testTrailingSlashes() public function testTrailingSlashes()
{ {
$baseDir = dirname(__FILE__).'/../../../fixtures/templates/'; $baseDir = dirname(__FILE__) . '/../../../fixtures/templates/';
$loader = new Mustache_Loader_FilesystemLoader($baseDir); $loader = new Mustache_Loader_FilesystemLoader($baseDir);
$this->assertEquals('one contents', $loader->load('one')); $this->assertEquals('one contents', $loader->load('one'));
} }
public function testConstructorWithProtocol() public function testConstructorWithProtocol()
{ {
$baseDir = realpath(dirname(__FILE__).'/../../../fixtures/templates'); $baseDir = realpath(dirname(__FILE__) . '/../../../fixtures/templates');
$loader = new Mustache_Loader_FilesystemLoader('file://' . $baseDir, array('extension' => '.ms')); $loader = new Mustache_Loader_FilesystemLoader('file://' . $baseDir, array('extension' => '.ms'));
$this->assertEquals('alpha contents', $loader->load('alpha')); $this->assertEquals('alpha contents', $loader->load('alpha'));
@@ -40,7 +40,7 @@ class Mustache_Test_Loader_FilesystemLoaderTest extends PHPUnit_Framework_TestCa
public function testLoadTemplates() public function testLoadTemplates()
{ {
$baseDir = realpath(dirname(__FILE__).'/../../../fixtures/templates'); $baseDir = realpath(dirname(__FILE__) . '/../../../fixtures/templates');
$loader = new Mustache_Loader_FilesystemLoader($baseDir); $loader = new Mustache_Loader_FilesystemLoader($baseDir);
$this->assertEquals('one contents', $loader->load('one')); $this->assertEquals('one contents', $loader->load('one'));
$this->assertEquals('two contents', $loader->load('two.mustache')); $this->assertEquals('two contents', $loader->load('two.mustache'));
@@ -48,7 +48,7 @@ class Mustache_Test_Loader_FilesystemLoaderTest extends PHPUnit_Framework_TestCa
public function testEmptyExtensionString() public function testEmptyExtensionString()
{ {
$baseDir = realpath(dirname(__FILE__).'/../../../fixtures/templates'); $baseDir = realpath(dirname(__FILE__) . '/../../../fixtures/templates');
$loader = new Mustache_Loader_FilesystemLoader($baseDir, array('extension' => '')); $loader = new Mustache_Loader_FilesystemLoader($baseDir, array('extension' => ''));
$this->assertEquals('one contents', $loader->load('one.mustache')); $this->assertEquals('one contents', $loader->load('one.mustache'));
@@ -64,7 +64,7 @@ class Mustache_Test_Loader_FilesystemLoaderTest extends PHPUnit_Framework_TestCa
*/ */
public function testMissingBaseDirThrowsException() public function testMissingBaseDirThrowsException()
{ {
new Mustache_Loader_FilesystemLoader(dirname(__FILE__).'/not_a_directory'); new Mustache_Loader_FilesystemLoader(dirname(__FILE__) . '/not_a_directory');
} }
/** /**
@@ -72,7 +72,7 @@ class Mustache_Test_Loader_FilesystemLoaderTest extends PHPUnit_Framework_TestCa
*/ */
public function testMissingTemplateThrowsException() public function testMissingTemplateThrowsException()
{ {
$baseDir = realpath(dirname(__FILE__).'/../../../fixtures/templates'); $baseDir = realpath(dirname(__FILE__) . '/../../../fixtures/templates');
$loader = new Mustache_Loader_FilesystemLoader($baseDir); $loader = new Mustache_Loader_FilesystemLoader($baseDir);
$loader->load('fake'); $loader->load('fake');