Fabien Potencier [Mon, 5 Aug 2013 16:21:48 +0000]
removed usage of deprecated constants
Fabien Potencier [Mon, 5 Aug 2013 16:18:58 +0000]
removed usage of deprecated classes in unit tests
Fabien Potencier [Mon, 5 Aug 2013 16:00:03 +0000]
fixed two edge case bug in the filesystem loader
* fixed caching when two templates have the same template name but a different namespace
* fixed the error message when a template has a namespace
Fabien Potencier [Mon, 5 Aug 2013 08:14:58 +0000]
reverted optimizations done in the filesystem loader as it beaks BC
Fabien Potencier [Mon, 5 Aug 2013 07:09:11 +0000]
fixed filesystem loader when the name needs to be normalized
Fabien Potencier [Sun, 4 Aug 2013 21:45:34 +0000]
simplified code
Fabien Potencier [Sun, 4 Aug 2013 13:12:06 +0000]
replaced usage of md5/sha1 by sha256
Fabien Potencier [Sun, 4 Aug 2013 13:09:59 +0000]
fixed template_from_string() cache side-effects
Fabien Potencier [Sun, 4 Aug 2013 13:08:44 +0000]
fixed CS
Fabien Potencier [Sun, 4 Aug 2013 13:05:27 +0000]
merged branch Cottser/master (PR #1071)
This PR was merged into the master branch.
Discussion
----------
Add static caching for Twig_Environment::getTemplateClass()
Coming from http://drupal.org/node/1979290.
```
=== baseline-views-field-twig..views-field-twig-static-cache compared (
517896dc57c6e..
5178989df1d0f):
ct : 116,895|115,892|-1,003|-0.9%
wt : 478,367|474,349|-4,018|-0.8%
cpu : 449,530|444,639|-4,891|-1.1%
mu : 17,447,208|17,453,200|5,992|0.0%
pmu : 17,658,176|17,664,136|5,960|0.0%
```
http://www.lionsad.de/xhprof-kit/xhprof/xhprof_html/?run1=
517896dc57c6e&run2=
5178989df1d0f&source=drupal-perf-cottser&extra=baseline-views-field-twig..views-field-twig-static-cache
We found that performance could be measurably improved when the same template is rendered multiple times in a request.
Commits
-------
4ae5385 Add static caching for Twig_Environment::getTemplateClass()
Fabien Potencier [Sun, 4 Aug 2013 13:01:42 +0000]
merged branch fabpot/complex-template_from_string (PR #1154)
This PR was merged into the master branch.
Discussion
----------
fixed template_from_string when the template includes or extends other ones
This should fix #1134
Commits
-------
1b5bf91 fixed template_from_string when the template includes or extends other ones
Fabien Potencier [Sun, 4 Aug 2013 13:01:03 +0000]
merged branch fabpot/filesystem-optimizations (PR #1155)
This PR was merged into the master branch.
Discussion
----------
optimized the filesystem loader
* added a cache for templates that do not exist
* sped up Filesystem::exists() by avoiding the creation of exceptions
closes #1096
Commits
-------
d2b97b4 optimized the filesystem loader
Fabien Potencier [Sun, 4 Aug 2013 12:55:22 +0000]
updated CHANGELOG
Fabien Potencier [Sun, 4 Aug 2013 12:54:06 +0000]
merged branch tucksaun/fix-issue-1143 (PR #1147)
This PR was merged into the master branch.
Discussion
----------
Fix issue #1143
Commits
-------
5042159 [ext] access static properties, fixed #1143
dfc335f Added test case for issue #1143
Fabien Potencier [Sun, 4 Aug 2013 11:34:56 +0000]
fixed versions in docs
Tugdual Saunier [Sun, 4 Aug 2013 10:10:59 +0000]
[ext] access static properties, fixed #1143
Twig extension access static properties wheras it should not
Fabien Potencier [Sun, 4 Aug 2013 06:56:55 +0000]
tweaked documentation about overloading existing filters, ... (closes #1094)
Fabien Potencier [Sun, 4 Aug 2013 06:27:13 +0000]
optimized the filesystem loader
* added a cache for templates that do not exist
* sped up Filesystem::exists() by avoiding the creation of exceptions
Fabien Potencier [Sun, 4 Aug 2013 06:43:33 +0000]
fixed the filesystem loader cache when a template name exists in several namespaces
Fabien Potencier [Sun, 4 Aug 2013 06:02:23 +0000]
fixed a bug in some unit tests (closes #1092)
Fabien Potencier [Sat, 3 Aug 2013 17:05:30 +0000]
fixed template_from_string when the template includes or extends other ones
Fabien Potencier [Sat, 3 Aug 2013 17:28:06 +0000]
added a note about how to use our PEAR channel to install the Twig C extension
Fabien Potencier [Sat, 3 Aug 2013 17:12:32 +0000]
unified LICENSEs between the PHP and the C code
Fabien Potencier [Sat, 3 Aug 2013 16:48:19 +0000]
fixed some unit tests
Fabien Potencier [Sat, 3 Aug 2013 16:36:32 +0000]
renamed an internal variable
Fabien Potencier [Sat, 3 Aug 2013 16:18:15 +0000]
added an exception when a macro re-uses the same argument name twice
Fabien Potencier [Sat, 3 Aug 2013 15:52:48 +0000]
updated CHANGELOG
Fabien Potencier [Sat, 3 Aug 2013 15:51:29 +0000]
merged branch hason/macros (PR #1139)
This PR was merged into the master branch.
Discussion
----------
Improved macros
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #861, #867, #929, #1052
| License | MIT
| Doc | yes
* Fixed fatal error for unknown macro
* Added support for named arguments for macros
* Added support for directly call macros defined in the same template
Commits
-------
3004ba1 Added support for directly call macros defined in the same template
63615a6 Added support for named arguments for macros
09fedb8 Fixed fatal error for unknown macro
9e96837 Refactored parsing of macros
Fabien Potencier [Sat, 3 Aug 2013 15:50:09 +0000]
bumped version to 1.14.0-DEV
Fabien Potencier [Sat, 3 Aug 2013 15:35:31 +0000]
prepared the 1.13.2 release
Fabien Potencier [Sat, 3 Aug 2013 15:19:26 +0000]
updated CHANGELOG
Fabien Potencier [Sat, 3 Aug 2013 15:15:16 +0000]
merged branch h2s/embed-error-line (PR #1140)
This PR was squashed before being merged into the master branch (closes #1140).
Discussion
----------
Fix for {% embed %} error line number bug
This deals with issue #958. I've gone into a lot of detail about the fix itself in the commit message for 12cc0a0, so I won't repeat any of that here. Take a look and let me know what you think!
Commits
-------
270b791 Fix for {% embed %} error line number bug
Henry Smith [Tue, 16 Jul 2013 21:08:51 +0000]
Fix for {% embed %} error line number bug
Martin Hasoň [Sat, 11 May 2013 18:04:07 +0000]
Added support for directly call macros defined in the same template
Martin Hasoň [Sat, 11 May 2013 10:50:59 +0000]
Added support for named arguments for macros
Fabien Potencier [Wed, 24 Jul 2013 03:16:45 +0000]
updated CHANGELOG
Fabien Potencier [Wed, 24 Jul 2013 03:14:54 +0000]
moved a test to the right place (refs #1146)
Fabien Potencier [Wed, 24 Jul 2013 03:09:29 +0000]
merged branch tucksaun/fix-issue-1126 (PR #1146)
This PR was merged into the master branch.
Discussion
----------
Fix issue #1126
@fabpot Is this way of adding the test case is ok for you?
Commits
-------
2430431 Fixed #1126
4ce9cbf Added test case for issue #1126
Tugdual Saunier [Tue, 23 Jul 2013 19:45:47 +0000]
Added test case for issue #1143
Tugdual Saunier [Tue, 23 Jul 2013 19:15:15 +0000]
Fixed #1126
Tugdual Saunier [Tue, 23 Jul 2013 19:36:05 +0000]
Added test case for issue #1126
Fabien Potencier [Tue, 23 Jul 2013 15:49:22 +0000]
merged branch tucksaun/php-55 (PR #1145)
This PR was merged into the master branch.
Discussion
----------
Added PHP 5.5 to travis build
Commits
-------
8639491 Added PHP 5.5 to travis build
Tugdual Saunier [Tue, 23 Jul 2013 15:32:39 +0000]
Added PHP 5.5 to travis build
Martin Hasoň [Sat, 11 May 2013 16:50:26 +0000]
Fixed fatal error for unknown macro
Martin Hasoň [Sat, 11 May 2013 16:52:48 +0000]
Refactored parsing of macros
Fabien Potencier [Mon, 15 Jul 2013 15:12:47 +0000]
merged branch ftassi/remove-extension-name-from-exception (PR #1138)
This PR was merged into the master branch.
Discussion
----------
Remove undefined variable usage
See https://github.com/fabpot/Twig/commit/
44873875ff6ca50c654e3bd28fe19b7ce5108f42#L1R728
Commits
-------
71d7d50 Remove undefined variable usage
Francesco Tassi [Mon, 15 Jul 2013 14:26:07 +0000]
Remove undefined variable usage
Fabien Potencier [Sat, 13 Jul 2013 19:24:37 +0000]
merged branch cs278/main-namespace-constant (PR #1124)
This PR was merged into the master branch.
Discussion
----------
Use a constant for the main namespace
Commits
-------
f80bab2 Use a constant for the main namespace
Fabien Potencier [Sat, 13 Jul 2013 19:17:34 +0000]
fixed a typo in the docs (closes #1136)
Fabien Potencier [Sat, 13 Jul 2013 19:15:14 +0000]
fixed a typo in the docs (closes #1137)
Fabien Potencier [Fri, 5 Jul 2013 17:16:02 +0000]
merged branch markstory/update-docs (PR #1132)
This PR was merged into the master branch.
Discussion
----------
Add more complete documentation for building tests.
In response to #1121 I've added more extensive documentation around implementing tests. Both with and without a node_class.
Commits
-------
da06f59 Add more complete documentation for building tests.
Mark Story [Thu, 4 Jul 2013 17:06:36 +0000]
Add more complete documentation for building tests.
Chris Smith [Fri, 28 Jun 2013 09:26:16 +0000]
Use a constant for the main namespace
Fabien Potencier [Thu, 27 Jun 2013 06:24:36 +0000]
Revert "Fixed PSR-0 in tests"
This reverts commit
b5928de258f849b96208e00454e5b284facb74db.
Fabien Potencier [Thu, 27 Jun 2013 06:24:31 +0000]
merged branch hason/patch1 (PR #1080)
This PR was merged into the master branch.
Discussion
----------
Small fixes
Commits
-------
a6205c5 Fixed exception message in Call
b5928de Fixed PSR-0 in tests
Fabien Potencier [Thu, 27 Jun 2013 06:19:54 +0000]
tweaked previous merge (refs #1114)
Fabien Potencier [Thu, 27 Jun 2013 06:19:31 +0000]
merged branch LouTerrailloune/patch-2 (PR #1114)
This PR was merged into the master branch.
Discussion
----------
Update url_encode.rst
Documented hidden feature to use rawurlencode.
Commits
-------
594e2db Update url_encode.rst
Fabien Potencier [Thu, 27 Jun 2013 06:18:27 +0000]
merged branch mattjanssen/spaceless-doc (PR #1122)
This PR was merged into the master branch.
Discussion
----------
Updated {% spaceless %} example to show how spaces in strings are handled
Updated output to show space is preserved within `<div><strong>foo bar</strong></div>` HTML.
Commits
-------
2861bef Updated {% spaceless %} example to show how spaces in strings are handled.
Matt Janssen [Wed, 26 Jun 2013 19:20:02 +0000]
Updated {% spaceless %} example to show how spaces in strings are handled.
Updated output to show space is preserved within `<div><strong>foo bar</strong></div>` HTML.
Fabien Potencier [Tue, 25 Jun 2013 16:45:01 +0000]
fixed (again) the license identifier in composer.json
Fabien Potencier [Tue, 25 Jun 2013 15:47:27 +0000]
fixed the license name in composer.json
Fabien Potencier [Sun, 9 Jun 2013 06:03:21 +0000]
merged branch igorsantos07/patch-1 (PR #1116)
This PR was merged into the master branch.
Discussion
----------
Update include.rst
Fixing typo: "Twig will ignore the statement if the template to be *ignored* does not exist."
[Sorry, typed the commit desc in the wrong box :( ]
Commits
-------
fb3fdac Update include.rst
Igor Santos [Sat, 8 Jun 2013 20:56:44 +0000]
Update include.rst
Fixing typo: "Twig will ignore the statement if the template to be *ignored* does not exist."
Vincent Terraillon [Fri, 7 Jun 2013 08:55:43 +0000]
Update url_encode.rst
Documented hidden feature to use rawurlencode.
Fabien Potencier [Fri, 7 Jun 2013 06:24:46 +0000]
merged branch hason/patch_2 (PR #1113)
This PR was merged into the master branch.
Discussion
----------
Fixed typo in doc for the reverse filter
Commits
-------
3c63626 Fixed typo in doc for the reverse filter
Martin Hasoň [Thu, 6 Jun 2013 20:55:44 +0000]
Fixed typo in doc for the reverse filter
Fabien Potencier [Thu, 6 Jun 2013 08:57:56 +0000]
bumped version to 1.13.2-DEV
Fabien Potencier [Thu, 6 Jun 2013 06:05:52 +0000]
prepared the 1.13.1 release
Fabien Potencier [Thu, 6 Jun 2013 06:02:21 +0000]
updated the CHANGELOG with missing items
Fabien Potencier [Thu, 6 Jun 2013 05:56:57 +0000]
added documentation for the preverse_keys argument of the reverse filter (closes #1112)
Fabien Potencier [Wed, 29 May 2013 14:58:12 +0000]
merged branch stof/include_escaping (PR #1110)
This PR was merged into the master branch.
Discussion
----------
Made the include function safe for the autoescaping
This fixes a regression introduced in
ba88c75557
Fixes #1097
I have not updated the changelog as the regression is not part of a release yet
Commits
-------
3bc113b Made the include function safe for the autoescaping
Christophe Coevoet [Wed, 29 May 2013 13:08:43 +0000]
Made the include function safe for the autoescaping
This fixes a regression introduced in
ba88c75557
Fixes #1097
Fabien Potencier [Wed, 29 May 2013 07:19:45 +0000]
merged branch luiges90/patch-1 (PR #1107)
This PR was merged into the master branch.
Discussion
----------
Update slice.rst
I was (somehow) misled by the example, thinking `'1234'[2:]` outputs `34` because it `2:` mean copy the last 2 characters...
This happens when you are in a hurry and didn't look into the text.
Let makes it less ambiguous.
Commits
-------
3ddff67 Update slice.rst
Fabien Potencier [Wed, 29 May 2013 07:18:50 +0000]
merged branch jrobeson/patch-1 (PR #1108)
This PR was merged into the master branch.
Discussion
----------
change mention of print to sprintf in format filter
The format specifiers are actually mentioned on the [sprintf](http://php.net/sprintf) page
Commits
-------
5746c11 change mention of print to sprintf in format filter
Johnny Robeson [Wed, 29 May 2013 07:15:52 +0000]
change mention of print to sprintf in format filter
The format specifiers are actually mentioned on the [sprintf(http://php.net/sprintf)] page
Peter WONG [Wed, 29 May 2013 03:18:36 +0000]
Update slice.rst
I was (somehow) misled by the example, thinking `'1234'[2:]` outputs `34` because it `2:` mean copy the last 2 characters...
This happens when you are in a hurry and didn't look into the text.
Let makes it less ambiguous.
Fabien Potencier [Mon, 27 May 2013 06:08:37 +0000]
added the possibility to ignore the filesystem constructor argument (closes #1104)
Fabien Potencier [Mon, 27 May 2013 06:04:18 +0000]
fixed doc markup (closes #1106)
Fabien Potencier [Sat, 25 May 2013 15:56:39 +0000]
tweaked previous merge (refs #1103)
Fabien Potencier [Sat, 25 May 2013 15:52:49 +0000]
merged branch kimu/patch-1 (PR #1103)
This PR was squashed before being merged into the master branch (closes #1103).
Discussion
----------
Added info about variable declarations inside a loop
Commits
-------
d5f4ec3 Added info about variable declarations inside a loop
kimu [Thu, 23 May 2013 16:41:50 +0000]
Added info about variable declarations inside a loop
Fabien Potencier [Sat, 25 May 2013 14:52:30 +0000]
merged branch DieterDePaepe/patch-1 (PR #1105)
This PR was merged into the master branch.
Discussion
----------
Add missing semicolon
Commits
-------
550503e Add missing semicolon
DieterDePaepe [Sat, 25 May 2013 12:42:31 +0000]
Add missing semicolon
Fabien Potencier [Thu, 23 May 2013 16:28:35 +0000]
added support for object instances as the second argument of the constant test (closes #1100)
Fabien Potencier [Fri, 17 May 2013 10:06:31 +0000]
fixed the include function when used in an assignment (closes #1095)
Fabien Potencier [Wed, 15 May 2013 14:22:32 +0000]
merged branch hason/chain (PR #1093)
This PR was merged into the master branch.
Discussion
----------
Fixed Twig_Loader_Chain::exists for a loader which implements Twig_ExistsLoaderInterface
Commits
-------
8a662f2 Fixed Twig_Loader_Chain::exists for a loader which implements Twig_ExistsLoaderInterface
Martin Hasoň [Wed, 15 May 2013 10:37:17 +0000]
Fixed Twig_Loader_Chain::exists for a loader which implements Twig_ExistsLoaderInterface
Fabien Potencier [Tue, 14 May 2013 07:20:57 +0000]
removed unneeded code
Fabien Potencier [Tue, 14 May 2013 05:05:22 +0000]
merged branch rrehbeindoi/error-memory (PR #1083)
This PR was squashed before being merged into the master branch (closes #1083).
Discussion
----------
Adjusted backtrace call to reduce memory usage
Commits
-------
cf3ee20 Adjusted backtrace call to reduce memory usage
Ray [Fri, 10 May 2013 17:08:06 +0000]
Adjusted backtrace call to reduce memory usage
Fabien Potencier [Tue, 14 May 2013 05:03:10 +0000]
merged branch kosssi/feature/fix-typo (PR #1090)
This PR was merged into the master branch.
Discussion
----------
fix documentation code block
Commits
-------
e9c1979 fix documentation code block
Simon Constans [Mon, 13 May 2013 20:34:50 +0000]
fix documentation code block
Fabien Potencier [Mon, 13 May 2013 11:46:19 +0000]
merged branch bamarni/docs-escape (PR #1087)
This PR was merged into the master branch.
Discussion
----------
[doc] switched a BC call
Commits
-------
12a5d02 [doc] switched a BC call
Bilal Amarni [Mon, 13 May 2013 11:14:39 +0000]
[doc] switched a BC call
Fabien Potencier [Fri, 10 May 2013 15:25:39 +0000]
bumped version to 1.13.1-DEV
Fabien Potencier [Fri, 10 May 2013 15:12:43 +0000]
prepared the 1.13.0 release
Martin Hasoň [Wed, 8 May 2013 19:49:15 +0000]
Fixed exception message in Call
Martin Hasoň [Tue, 7 May 2013 20:51:00 +0000]
Fixed PSR-0 in tests
Fabien Potencier [Tue, 7 May 2013 18:59:32 +0000]
fixed CHANGELOG
Fabien Potencier [Tue, 7 May 2013 18:56:07 +0000]
merged branch Tobion/patch-1 (PR #1030)
This PR was merged into the master branch.
Discussion
----------
fix numeric & boolean & float keys in array
Reopened PR of #878
Commits
-------
2c56b70 Merge pull request #3 from tucksaun/patch-1
17d6cc7 [ext] fixed tabs
46012ce [ext] improvements
21f8062 [ext] code cleaning
9347c52 [ext] updated PHP code documenting C code
b41ce60 updated C extension accordingly
e5291e1 rename item to attribute in the exception message because that's the term that is used in twig, e.g. the function
a93f0dc further improved exception message and distinguish array_call and any_call access
26bac14 added tests for array access with confusable keys
db744d5 fix test that that would not fail if no exception is thrown
9ea16ec refactored getAttribute
6fb5afa improved error message for non-existent or invalid attributes
fdfd506 added changelog entry about fixed boolean array access
da616c5 fixed getAttribute for array access with a boolean or float key
b6acf9d updated CHANGELOG
c4d5b3f added some unit tests for previous merge
e84448b fix numeric keys in array