Fabien Potencier [Mon, 20 Aug 2012 19:10:44 +0000]
merged branch arnaud-lb/807 (PR #812)
Commits
-------
3ca6654 avoid crash when TWIG_GET_ARRAY_ELEMENT returns NULL
3694d4b allow --EXCEPTION-- tests to have a --DATA-- block
Discussion
----------
Fix for #807 (Segmentation fault when exception thrown inside any of ArrayAccess implementation methods)
This fixes #807
Arnaud Le Blanc [Mon, 20 Aug 2012 18:28:22 +0000]
avoid crash when TWIG_GET_ARRAY_ELEMENT returns NULL
fixes #807
Arnaud Le Blanc [Mon, 20 Aug 2012 18:27:57 +0000]
allow --EXCEPTION-- tests to have a --DATA-- block
Fabien Potencier [Fri, 17 Aug 2012 17:01:21 +0000]
merged branch garak/patch-1 (PR #809)
Commits
-------
fce92f8 Update doc/templates.rst
Discussion
----------
Update doc/templates.rst
Komodo and Komodo Edit have builtin Twig support since last version (7.1)
Massimiliano Arione [Fri, 17 Aug 2012 15:14:24 +0000]
Update doc/templates.rst
Komodo and Komodo Edit have builtin Twig support since last version (7.1)
Fabien Potencier [Tue, 7 Aug 2012 08:38:05 +0000]
merged branch sdepablos/master (PR #802)
Commits
-------
b98fff1 Added missing abs and date_modify functions to the filters toctree
Discussion
----------
Added missing abs and date_modify functions to the filters toctree
Both abs.rst and date_modify.rst were createad, but were not linked on the filters toctree
Sergi de Pablos [Tue, 7 Aug 2012 08:31:19 +0000]
Added missing abs and date_modify functions to the filters toctree
Fabien Potencier [Sat, 28 Jul 2012 08:32:10 +0000]
added a test to verify that the merge filter actually behaves like said in the documentation (closes #789)
Fabien Potencier [Sun, 22 Jul 2012 10:32:58 +0000]
bumped version to 1.9.2-DEV
Fabien Potencier [Sun, 22 Jul 2012 10:25:41 +0000]
prepared the 1.9.1 release
Fabien Potencier [Sat, 21 Jul 2012 22:07:57 +0000]
reverted partially a previous commit
This code was not only useful for macros but also when you call a method on
a template instance -- this is not recommended/supported but used by the Symfony profiler)
Fabien Potencier [Sat, 21 Jul 2012 21:20:56 +0000]
optimized macro calls when auto-escaping is on (closes #779)
Fabien Potencier [Sat, 21 Jul 2012 20:47:06 +0000]
moved some macro related logic to the generated code
Fabien Potencier [Fri, 20 Jul 2012 12:41:38 +0000]
merged branch acasademont/patch-1 (PR #781)
Commits
-------
ee87848 Little typo
c31dd7b The empty test now also checks for empty arrays
Discussion
----------
The empty test now also checks for empty arrays
Little change in the docs to reflect that, as i had to check the source code to see if it worked
Albert Casademont [Thu, 19 Jul 2012 11:03:26 +0000]
Little typo
Albert Casademont [Thu, 19 Jul 2012 11:00:01 +0000]
The empty test now also checks for empty arrays
Fabien Potencier [Thu, 19 Jul 2012 05:29:29 +0000]
updated CHANGELOG
Fabien Potencier [Wed, 18 Jul 2012 21:07:28 +0000]
merged branch pborreli/master (PR #771)
Commits
-------
1c98282 Removed duplicate array keys
30a168c Fixing typos
Discussion
----------
Fixed typos
Fabien Potencier [Wed, 18 Jul 2012 21:05:29 +0000]
fixed typo in previous merge
Fabien Potencier [Wed, 18 Jul 2012 21:03:43 +0000]
merged branch Nami-Doc/patch-1 (PR #773)
Commits
-------
a6f03bd Reverse argument for number_format
Discussion
----------
Reverse argument for number_format
Just a little fix, the doc isn't following twig/php's argument order
Fabien Potencier [Wed, 18 Jul 2012 21:00:28 +0000]
merged branch havvg/patch-1 (PR #777)
Commits
-------
0869d15 fix example autoescape for javascript
Discussion
----------
fix example autoescape for javascript
{% autoescape js %} triggers an exception "An escaping strategy must be a string or a Boolean in .."
Fabien Potencier [Wed, 18 Jul 2012 07:53:29 +0000]
added a note about accessing variable attributes that contains operators (closes #775)
Fabien Potencier [Wed, 18 Jul 2012 07:48:23 +0000]
made Twig_Loader_Chain more explicit about problems
Toni Uebernickel [Tue, 17 Jul 2012 14:52:07 +0000]
fix example autoescape for javascript
{% autoescape js %} triggers an exception "An escaping strategy must be a string or a Boolean in .."
Fabien Potencier [Mon, 16 Jul 2012 07:42:44 +0000]
merged branch Tobion/patch-6 (PR #774)
Commits
-------
9d1f645 fix Twig_Function_Node extending wrong class
Discussion
----------
fix Twig_Function_Node extending wrong class
Tobias Schultze [Sun, 15 Jul 2012 21:06:53 +0000]
fix Twig_Function_Node extending wrong class
Nami-Doc [Sun, 15 Jul 2012 11:50:43 +0000]
Reverse argument for number_format
Fabien Potencier [Sat, 14 Jul 2012 14:10:03 +0000]
refactored the loader documentation
Pascal Borreli [Fri, 13 Jul 2012 17:01:16 +0000]
Removed duplicate array keys
Pascal Borreli [Fri, 13 Jul 2012 17:00:31 +0000]
Fixing typos
Fabien Potencier [Fri, 13 Jul 2012 16:31:16 +0000]
bumped version to 1.9.1-DEV
Fabien Potencier [Fri, 13 Jul 2012 16:26:34 +0000]
prepared the 1.9.0 release
Fabien Potencier [Fri, 13 Jul 2012 06:40:06 +0000]
fixed the template escaper guesser example
Fabien Potencier [Fri, 13 Jul 2012 06:31:08 +0000]
clarified usage of the string and array loaders
Fabien Potencier [Thu, 12 Jul 2012 19:30:05 +0000]
merged branch Adel-E/patch-1 (PR #767)
Commits
-------
0cb37ba Fix typehint "int" to "integer"
Discussion
----------
Fix typehint "int" to "integer"
---------------------------------------------------------------------------
by nikic at 2012-07-09T21:13:48Z
Why would you want to do that?
---------------------------------------------------------------------------
by Adel-E at 2012-07-09T21:21:34Z
Because in this file all @param use integer instead of int
Fabien Potencier [Thu, 12 Jul 2012 14:51:31 +0000]
scaled back on named HTML entities since HTML 5's XML serialisation is actually XML (not XHTML)
see https://github.com/zendframework/zf2/commit/
d5862587ae7c2ff2da873f1bf30003103134a365
Fabien Potencier [Tue, 10 Jul 2012 16:30:12 +0000]
made the parsing independent of the template loaders
This basically reverts
57ff88255ef35ad8da325d0cb0bf140e653b132c
Fabien Potencier [Tue, 10 Jul 2012 12:56:21 +0000]
fixed PHP 5.2 issue in unit tests
Fabien Potencier [Tue, 10 Jul 2012 12:40:33 +0000]
fixed exception trace when an error occurs when rendering a child template
Adel [Mon, 9 Jul 2012 20:28:19 +0000]
Fix typehint "int" to "integer"
Fabien Potencier [Wed, 4 Jul 2012 17:33:25 +0000]
fixed composer version
Fabien Potencier [Sat, 30 Jun 2012 08:06:47 +0000]
merged branch shieldo/patch-2 (PR #763)
Commits
-------
4e4d41b improved English in example text
Discussion
----------
improved English in example text
Douglas Greenshields [Fri, 29 Jun 2012 18:16:04 +0000]
improved English in example text
Fabien Potencier [Thu, 28 Jun 2012 13:39:18 +0000]
merged branch stealth35/sanitize_ext (PR #761)
Commits
-------
9229ef3 Removed useless code
Discussion
----------
[Ext] Removed useless code
All init hooks could be bypassed (just return `SUCESS`)
There is no `ini` entries and no globals
Phpinfo automatically get the version when `MINFO` is null
Twig don't work with PHP 4 (ref to `
20010901`)
stealth35 [Wed, 27 Jun 2012 15:57:06 +0000]
Removed useless code
Fabien Potencier [Wed, 27 Jun 2012 09:49:34 +0000]
fixed PHP 5.2 incompatibilty
Fabien Potencier [Wed, 27 Jun 2012 09:18:21 +0000]
fixed url escaping strategy for PHP 5.2
Fabien Potencier [Wed, 27 Jun 2012 09:12:10 +0000]
merged branch Seldaek/date_modify (PR #760)
Commits
-------
2c9e26e Fix date_modify filter for PHP 5.2
Discussion
----------
Fix date_modify filter for PHP 5.2
The return of the object was added in 5.3, this hopefully fixes it.
Jordi Boggiano [Wed, 27 Jun 2012 08:25:59 +0000]
Fix date_modify filter for PHP 5.2
Fabien Potencier [Wed, 27 Jun 2012 07:07:27 +0000]
added support for more escaping strategies (url, css, and html_attr)
Fabien Potencier [Tue, 26 Jun 2012 16:24:26 +0000]
tweaked previous commit
Fabien Potencier [Tue, 26 Jun 2012 16:23:42 +0000]
merged branch Seldaek/date_modify (PR #757)
Commits
-------
ae85586 Add docs for date_modify
0366cf6 Fix docs of date filter
Discussion
----------
Date modify filter
This is probably possible via `date(foo)|modify('-1day')|format()`, but it's non obvious and a dedicated filter might be a bit more prominent.
---------------------------------------------------------------------------
by fabpot at 2012-06-22T07:01:32Z
Just a quick thought: As it modifies the date, it should probably be a function, not a filter.
---------------------------------------------------------------------------
by stof at 2012-06-22T07:24:52Z
@fabpot Aren't filters meant to transform the value ?
Fabien Potencier [Tue, 26 Jun 2012 15:59:41 +0000]
fixed nested embed tag calls
Fabien Potencier [Tue, 26 Jun 2012 15:12:23 +0000]
merged branch meandmymonkey/clarify-pre_escape (PR #758)
Commits
-------
f840670 clarified documentation of pre_escape option
Discussion
----------
Clarified documentation of pre_escape option
The previous wording could be misunderstood as "tell the filter that the input has already been escaped", which is actually the opposite from how it works.
Andreas Hucks [Mon, 25 Jun 2012 17:09:27 +0000]
clarified documentation of pre_escape option
Jordi Boggiano [Wed, 20 Jun 2012 17:45:35 +0000]
Add docs for date_modify
Jordi Boggiano [Wed, 20 Jun 2012 17:45:27 +0000]
Fix docs of date filter
Fabien Potencier [Sun, 17 Jun 2012 18:52:23 +0000]
bumped version to 1.8.4-DEV
Fabien Potencier [Sun, 17 Jun 2012 18:48:16 +0000]
prepared the 1.8.3 release
Fabien Potencier [Thu, 14 Jun 2012 15:05:56 +0000]
fixed paths in the filesystem loader when passing a path that ends with a slash or a backslash (closes #750)
Fabien Potencier [Thu, 14 Jun 2012 15:02:35 +0000]
fixed typos
Fabien Potencier [Thu, 14 Jun 2012 15:00:28 +0000]
fixed escaping when a project defines a function named html or js (closes #724)
Fabien Potencier [Thu, 14 Jun 2012 13:20:28 +0000]
added some information about template recompilation (closes #743)
Fabien Potencier [Thu, 14 Jun 2012 13:15:52 +0000]
tweaked doc
Fabien Potencier [Thu, 14 Jun 2012 13:07:01 +0000]
fixed doc (closes #744)
Libert KHE [Wed, 6 Jun 2012 19:23:49 +0000]
added missing comment added (closes #476)
Fabien Potencier [Wed, 13 Jun 2012 06:24:34 +0000]
merged branch adrienbrault/patch-1 (PR #751)
Commits
-------
80a2a7e [Doc] Fix some typos
Discussion
----------
[Doc] Fix some typos
Hi!
Adrien Brault [Tue, 12 Jun 2012 22:27:42 +0000]
[Doc] Fix some typos
Fabien Potencier [Sun, 10 Jun 2012 13:13:55 +0000]
fixed chmod mode to apply the umask correctly (closes #749)
Fabien Potencier [Sat, 9 Jun 2012 06:45:24 +0000]
fixed a phpdoc (closes #748)
Fabien Potencier [Fri, 8 Jun 2012 14:55:41 +0000]
added a note in the CHANGELOG (refs #745)
Fabien Potencier [Fri, 8 Jun 2012 14:53:09 +0000]
merged branch catchamonkey/compiler_outdent (PR #747)
Commits
-------
459a076 The Compiler outdent method will now only reduce the indentation if it's OK to do so, It moves and modifies the check up above the indentation modification.
Discussion
----------
Compiler outdent step validation moved up and modified
The Compiler outdent method will now only reduce the indentation if it's OK
to do so, It moves and modifies the check up above the indentation modification.
It's a small improvement but saves a wasted decrement of a variable, when you know an exception will be thrown immediately following it.
---------------------------------------------------------------------------
by nikic at 2012-06-07T23:18:00Z
Compared to throwing an exception decrementing a variable has practically no cost ;)
PS: Not saying that the change is bad or something like that, only saying that performance is the wrong reason to do it :)
---------------------------------------------------------------------------
by catchamonkey at 2012-06-07T23:20:23Z
Yeah, there is no performance gain, but the code only executes that which is necessary.
It's like there being no point preparing a response before you know if you are going to send it. (slightly OTT example, but you get what I mean) :)
Chris Sedlmayr [Thu, 7 Jun 2012 22:45:55 +0000]
The Compiler outdent method will now only reduce the indentation if it's OK
to do so, It moves and modifies the check up above the indentation modification.
Fabien Potencier [Thu, 31 May 2012 05:17:23 +0000]
added Komodo to the list of supported IDEs
Fabien Potencier [Wed, 30 May 2012 20:55:03 +0000]
added Coda 2 in the list of supported IDEs
Fabien Potencier [Wed, 30 May 2012 06:18:29 +0000]
bumped version to 1.8.3
Fabien Potencier [Wed, 30 May 2012 06:15:36 +0000]
prepared the 1.8.2 release
Fabien Potencier [Tue, 29 May 2012 18:38:42 +0000]
fixed some CS issues
Fabien Potencier [Tue, 29 May 2012 18:09:42 +0000]
merged branch blaugueux/master (PR #736)
Commits
-------
c53a02d Fixed DateTimeZone support in date filter.
Discussion
----------
Fixed DateTimeZone support in date filter.
Now $date converted to a DateTime has a DateTimeZone in every case.
---------------------------------------------------------------------------
by fabpot at 2012-05-28T19:20:47Z
Can you add some unit tests to avoid regression to happen later? Thanks.
---------------------------------------------------------------------------
by blaugueux at 2012-05-29T07:52:58Z
@fabpot Here they are.
---------------------------------------------------------------------------
by fabpot at 2012-05-29T10:29:28Z
Great! Can you add a note in the CHANGELOG file and then squash your commit before I merge? Thanks.
---------------------------------------------------------------------------
by blaugueux at 2012-05-29T12:52:22Z
Changelog added. First squash of my life, i cannot say if it's good :(
---------------------------------------------------------------------------
by stof at 2012-05-29T12:55:26Z
it is not. you merged your remote branch instead of forcing the push
---------------------------------------------------------------------------
by blaugueux at 2012-05-29T17:12:05Z
Ok @stof, thanks for your help. I think it's good now.
@fabpot Is it ok for you ?
Benjamin Laugueux [Fri, 25 May 2012 19:29:08 +0000]
Fixed DateTimeZone support in date filter.
Prevents the DateTime object to be updated when changing the DateTimeZone.
Unit tests added.
Updated changelog.
Fabien Potencier [Mon, 28 May 2012 20:55:00 +0000]
updated CHANGELOG
Fabien Potencier [Mon, 28 May 2012 20:54:16 +0000]
merged branch maartendekeizer/master (PR #738)
Commits
-------
f0a0036 Add abs filter including unit test and documentation
Discussion
----------
Add abs filter to Twig
With abs it is possible to make negative values positive and leave positive values positive.
---------------------------------------------------------------------------
by maartendekeizer at 2012-05-26T19:02:34Z
Example when using abs
{% if days_left < 0 %}
{{ days_left|abs }} days to late!
{% else %}
{{ days_left }} days left
{% endif %}
---------------------------------------------------------------------------
by stof at 2012-05-26T19:12:43Z
I'm not sure about adding this filter in the core. I think it would be better in the Twig-extensions repo. @fabpot thoughts ?
---------------------------------------------------------------------------
by maartendekeizer at 2012-05-26T21:18:47Z
@stof abs is a really basic/natural function it belongs to the base mathematic functions. If this was an implementation of for example the ABC-formula or Pythagoras it must be in the extension repo., but abs is more core related I think.
---------------------------------------------------------------------------
by fabpot at 2012-05-27T07:11:33Z
Can you add some unit tests and squash your commits? Thanks.
---------------------------------------------------------------------------
by maartendekeizer at 2012-05-27T14:40:56Z
First time squashing commits; learned something new :-). I will add a unit test tomorrow.
---------------------------------------------------------------------------
by maartendekeizer at 2012-05-27T17:36:58Z
Unit test and documentation added.
---------------------------------------------------------------------------
by fabpot at 2012-05-27T18:41:25Z
After fixing the markup issue, you will have to squash again ;)
---------------------------------------------------------------------------
by maartendekeizer at 2012-05-27T20:44:29Z
Done
---------------------------------------------------------------------------
by fabpot at 2012-05-28T19:19:55Z
Looks like you have not squash your commits.
---------------------------------------------------------------------------
by maartendekeizer at 2012-05-28T20:05:34Z
@fabot you want one commit for the complete pr?
---------------------------------------------------------------------------
by fabpot at 2012-05-28T20:06:53Z
For such a PR, yes.
Maarten de Keizer [Sat, 26 May 2012 18:45:50 +0000]
Add abs filter
including unit test and documentation
Fabien Potencier [Mon, 28 May 2012 06:44:30 +0000]
merged branch hhamon/doc_fixes (PR #737)
Commits
-------
953a0ce [doc] fixed Composer section of the introduction. Added a side note to the Composer official documentation for getting more information.
Discussion
----------
[doc] fixed twig version in installation documentation.
---------------------------------------------------------------------------
by lyrixx at 2012-05-25T23:30:01Z
why not use something like "1.*" ?
---------------------------------------------------------------------------
by fabpot at 2012-05-26T05:55:16Z
This is just an example and we are not going to update it with each new release. So, we can either use `1.*` as suggested by @lyrixx or/and add a note referring to the Composer docs.
---------------------------------------------------------------------------
by hhamon at 2012-05-28T05:34:54Z
That's better indeed!
---------------------------------------------------------------------------
by hhamon at 2012-05-28T05:40:46Z
@fabpot you can merge this PR
---------------------------------------------------------------------------
by fabpot at 2012-05-28T06:07:05Z
Can you squash?
---------------------------------------------------------------------------
by hhamon at 2012-05-28T06:31:42Z
@fabpot squashed!
Hugo Hamon [Fri, 25 May 2012 20:16:33 +0000]
[doc] fixed Composer section of the introduction. Added a side note to the Composer official documentation for getting more information.
Fabien Potencier [Sat, 26 May 2012 06:30:56 +0000]
fixed an obsolete comment in phpdoc
Fabien Potencier [Wed, 23 May 2012 05:50:33 +0000]
fixed a regression when using a number in template attributes (closes #733)
Fabien Potencier [Wed, 23 May 2012 05:40:44 +0000]
added an example for the loop variable (closes #732)
Fabien Potencier [Mon, 21 May 2012 11:39:18 +0000]
fixed compiler when mbstring.func_overload is set to 2 (closes #731)
Fabien Potencier [Sat, 19 May 2012 07:41:36 +0000]
fixed CS
Fabien Potencier [Thu, 17 May 2012 16:06:57 +0000]
bumped version to 1.8.2-DEV
Fabien Potencier [Thu, 17 May 2012 16:02:47 +0000]
prepared the 1.8.1 release
Fabien Potencier [Thu, 17 May 2012 07:08:48 +0000]
merged branch Tobion/patch-5 (PR #729)
Commits
-------
b692268 removed leftover of
93c4406f8 and made some language improvements
Discussion
----------
removed leftover of
93c4406f8 and made some language improvements
Tobias Schultze [Wed, 16 May 2012 21:21:17 +0000]
removed leftover of
93c4406f8 and made some language improvements
Fabien Potencier [Wed, 16 May 2012 15:00:05 +0000]
fixed tests for PHP 5.2
Fabien Potencier [Wed, 16 May 2012 14:24:38 +0000]
fixed typos in the doc (closes #726)
Fabien Potencier [Wed, 16 May 2012 14:22:01 +0000]
updated CHANGELOG
Fabien Potencier [Wed, 16 May 2012 14:20:34 +0000]
fixed CHANGELOG
Fabien Potencier [Wed, 16 May 2012 14:18:48 +0000]
Fabien Potencier [Wed, 16 May 2012 14:01:19 +0000]
removed obsolete code