geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-17 21:07:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  bumped version to 1.32.1-DEV
  prepared the 1.32.0 release
  udpated CHANGELOG
  improved some tests
  removed trailing space
This commit is contained in:
Fabien Potencier
2017-02-26 16:08:51 -08:00
parent 4569e476a8 27d7ea9675
commit d37b38d79b
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+6 -1
View File
@@ -29,8 +29,13 @@
* improved the performance of the filesystem loader
* removed features that were deprecated in 1.x
* 1.32.0 (2017-XX-XX)
* 1.32.1 (2017-XX-XX)
* n/a
* 1.32.0 (2017-02-26)
* fixed deprecation notice in Twig_Util_DeprecationCollector
* added a PSR-11 compatible runtime loader
* added `side` argument to `trim` to allow left or right trimming only.
lib/Twig/Extension/Core.php
+1 -1
View File
@@ -852,7 +852,7 @@ function twig_in_filter($value, $compare)
return false;
}
/**
/**
* Returns a trimmed string.
*
* @return string
test/Twig/Tests/Fixtures/filters/trim.test
+6 -6
View File
@@ -4,9 +4,9 @@
{{ " I like Twig. "|trim }}
{{ text|trim }}
{{ " foo/"|trim("/") }}
{{ " I like Twig. "|trim(side="left") }}
{{ " I like Twig. "|trim(side="right") }}
{{ " I like Twig. "|trim(null, "right") }}
{{ "xxxI like Twig.xxx"|trim(character_mask="x", side="left") }}
{{ "xxxI like Twig.xxx"|trim(side="right", character_mask="x") }}
{{ "xxxI like Twig.xxx"|trim("x", "right") }}
{{ "/ foo/"|trim("/", "left") }}
{{ "/ foo/"|trim(character_mask="/", side="left") }}
{{ " do nothing. "|trim("", "right") }}
@@ -16,9 +16,9 @@ return array('text' => " If you have some <strong>HTML</strong> it will be esca
I like Twig.
If you have some &lt;strong&gt;HTML&lt;/strong&gt; it will be escaped.
foo
I like Twig.
I like Twig.
I like Twig.
I like Twig.xxx
xxxI like Twig.
xxxI like Twig.
foo/
foo/
do nothing.