geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,027 Commits 10 Branches 273 Tags
696ef2daaab95f51bf8802d43a7639fabf3aba89
Commit Graph

2027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier 696ef2daaa removed usage of deprecated classes in unit tests 2013-08-05 18:18:58 +02:00
Fabien Potencier f888818fd4 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
 2013-08-05 18:00:05 +02:00
Fabien Potencier 7c1ce36f87 reverted optimizations done in the filesystem loader as it beaks BC 2013-08-05 10:15:36 +02:00
Fabien Potencier e59c443aa8 fixed filesystem loader when the name needs to be normalized 2013-08-05 09:09:11 +02:00
Fabien Potencier 327b39bb08 simplified code 2013-08-04 23:45:34 +02:00
Fabien Potencier 9a01db60e8 replaced usage of md5/sha1 by sha256 2013-08-04 15:12:06 +02:00
Fabien Potencier a834dbb224 fixed template_from_string() cache side-effects 2013-08-04 15:09:59 +02:00
Fabien Potencier 9859a7e175 fixed CS 2013-08-04 15:08:44 +02:00
Fabien Potencier 2f5c9899a4 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()
 2013-08-04 15:05:27 +02:00
Fabien Potencier 4e7094f6a3 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
 2013-08-04 15:01:42 +02:00
Fabien Potencier 5402a658d5 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
 2013-08-04 15:01:03 +02:00
Fabien Potencier ce502dc7b6 updated CHANGELOG 2013-08-04 14:55:22 +02:00
Fabien Potencier 07b86d2852 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
 2013-08-04 14:54:06 +02:00
Fabien Potencier 8b576e08f2 fixed versions in docs 2013-08-04 13:34:56 +02:00
Tugdual Saunier 5042159ec4 [ext] access static properties, fixed #1143 
Twig extension access static properties wheras it should not
 2013-08-04 12:20:23 +02:00
Fabien Potencier 0559cacfaf tweaked documentation about overloading existing filters, ... (closes #1094) 2013-08-04 08:56:55 +02:00
Fabien Potencier d2b97b49f2 optimized the filesystem loader 
* added a cache for templates that do not exist
* sped up Filesystem::exists() by avoiding the creation of exceptions
 2013-08-04 08:48:38 +02:00
Fabien Potencier 1b0a54189c fixed the filesystem loader cache when a template name exists in several namespaces 2013-08-04 08:43:33 +02:00
Fabien Potencier 3e4c6ab3dc fixed a bug in some unit tests (closes #1092) 2013-08-04 08:03:52 +02:00
Fabien Potencier 1b5bf91011 fixed template_from_string when the template includes or extends other ones 2013-08-03 19:28:34 +02:00
Fabien Potencier 6c5f966045 added a note about how to use our PEAR channel to install the Twig C extension 2013-08-03 19:28:06 +02:00
Fabien Potencier 45d33e572f unified LICENSEs between the PHP and the C code 2013-08-03 19:12:32 +02:00
Fabien Potencier 120518d803 fixed some unit tests 2013-08-03 18:48:19 +02:00
Fabien Potencier a176fadc04 renamed an internal variable 2013-08-03 18:36:32 +02:00
Fabien Potencier b7a54b0101 added an exception when a macro re-uses the same argument name twice 2013-08-03 18:20:18 +02:00
Fabien Potencier 7ffca6c735 updated CHANGELOG 2013-08-03 17:52:51 +02:00
Fabien Potencier 03926034c4 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
 2013-08-03 17:51:29 +02:00
Fabien Potencier 730aa25bed bumped version to 1.14.0-DEV 2013-08-03 17:50:09 +02:00
Fabien Potencier 6d6a100942 prepared the 1.13.2 release v1.13.2 2013-08-03 17:35:31 +02:00
Fabien Potencier aae4c29a01 updated CHANGELOG 2013-08-03 17:19:26 +02:00
Fabien Potencier e3e366928b 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
 2013-08-03 17:15:16 +02:00
Henry Smith 270b791ed3 Fix for {% embed %} error line number bug 2013-08-03 17:15:16 +02:00
Martin Hasoň 3004ba19d4 Added support for directly call macros defined in the same template 2013-07-29 23:14:04 +02:00
Martin Hasoň 63615a6cc3 Added support for named arguments for macros 2013-07-29 23:13:25 +02:00
Fabien Potencier 0e63ef04a0 updated CHANGELOG 2013-07-24 05:16:45 +02:00
Fabien Potencier cefa33adff moved a test to the right place (refs #1146) 2013-07-24 05:14:54 +02:00
Fabien Potencier 682012b65b 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
 2013-07-24 05:09:29 +02:00
Tugdual Saunier dfc335fd4e Added test case for issue #1143 2013-07-23 22:04:57 +02:00
Tugdual Saunier 243043134c Fixed #1126 2013-07-23 21:36:14 +02:00
Tugdual Saunier 4ce9cbf486 Added test case for issue #1126 2013-07-23 21:36:05 +02:00
Fabien Potencier 9fa5410a86 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
 2013-07-23 17:49:22 +02:00
Tugdual Saunier 86394915ed Added PHP 5.5 to travis build 2013-07-23 17:39:54 +02:00
Martin Hasoň 09fedb80f8 Fixed fatal error for unknown macro 2013-07-16 10:46:54 +02:00
Martin Hasoň 9e96837827 Refactored parsing of macros 2013-07-16 10:43:52 +02:00
Fabien Potencier c35d7f267f 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
 2013-07-15 17:12:47 +02:00
Francesco Tassi 71d7d50bf9 Remove undefined variable usage 2013-07-15 16:26:07 +02:00
Fabien Potencier 545403be11 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
 2013-07-13 21:24:37 +02:00
Fabien Potencier 3e6e70e228 fixed a typo in the docs (closes #1136) 2013-07-13 21:17:34 +02:00
Fabien Potencier e142fcad9a fixed a typo in the docs (closes #1137) 2013-07-13 21:15:14 +02:00
Fabien Potencier 89007e5cc1 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.
 2013-07-05 19:16:02 +02:00