geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 19:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inlining of sources with CRLF

Browse Source
This commit is contained in:
Nicolas Grekas
2015-09-11 17:49:20 +02:00
parent 4d6d3a5944
commit 7e666cba8d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Environment.php
+1 -1
View File
@@ -641,7 +641,7 @@ class Twig_Environment
$compiled = $this->compile($this->parse($this->tokenize($source, $name)), $source); $compiled = $this->compile($this->parse($this->tokenize($source, $name)), $source);
if (isset($source[0])) { if (isset($source[0])) {
$compiled .= '/* '.str_replace(array("\r\n", "\r", "\n"), "*/\n/* ", str_replace('*/', '*//*', $source))."*/\n"; $compiled .= '/* '.strtr($source, array('*/' => '*//*', "\r\n" => "*/\n/* ", "\r" => "*/\n/* ", "\n" => "*/\n/* "))."*/\n";
} }
return $compiled; return $compiled;
test/Twig/Tests/EnvironmentTest.php
+1 -1
View File
@@ -142,7 +142,7 @@ class Twig_Tests_EnvironmentTest extends PHPUnit_Framework_TestCase
{ {
$twig = new Twig_Environment($this->getMock('Twig_LoaderInterface')); $twig = new Twig_Environment($this->getMock('Twig_LoaderInterface'));
$source = "<? /*foo*/ ?>\nbar\n"; $source = "<? /*foo*/ ?>\r\nbar\n";
$expected = "/* <? /*foo*//* ?>*/\n/* bar*/\n/* */\n"; $expected = "/* <? /*foo*//* ?>*/\n/* bar*/\n/* */\n";
$this->assertContains($expected, $twig->compileSource($source, 'index')); $this->assertContains($expected, $twig->compileSource($source, 'index'));