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."
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
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
Fabien Potencier [Tue, 7 May 2013 18:41:54 +0000]
udpated CHANGELOG
Fabien Potencier [Tue, 7 May 2013 18:41:16 +0000]
merged branch Seldaek/optim (PR #1077)
This PR was merged into the master branch.
Discussion
----------
Some more optimizations
Please look at commits one by one. Overall this makes the twig_escape_filter almost 20% faster here for happy path (escaping string for html with UTF-8) on 1000 calls. Still pretty darn slow, but faster.
Commits
-------
d886b12 Make happy path (strings) faster by avoiding the cast, same perfs for the other cases
97bf5e5 Avoid unnecessary is_object call
c1c0dcc Use uppercased charsets consistently (as in js/css/html_attr strategies)
a23fa62 Add UTF-8 in uppercase since it is so common
c891c53 Avoid strtolower call at every twig_escape_filter call
61f2b2a Use plain string comparison which is twice as fast
d4eec01 Move html case up since it is the most likely to be hit
Fabien Potencier [Tue, 7 May 2013 18:36:38 +0000]
merged branch Seldaek/optim2 (PR #1078)
This PR was merged into the master branch.
Discussion
----------
Optimize resume after for loops by using + vs array_merge
The plus operator seems to be almost twice as fast as array_merge, so I think in this case and given it's compiled code not made for humans it's worth it. The only potential problem is if you use ints as keys then it won't have the same behavior as array_merge, but I don't know if twig supports this at all, and especially I doubt it's a good idea.
Commits
-------
d753241 Optimize resume after for loops by using + vs array_merge
Jordi Boggiano [Mon, 6 May 2013 13:11:10 +0000]
Optimize resume after for loops by using + vs array_merge
Jordi Boggiano [Mon, 6 May 2013 12:32:20 +0000]
Make happy path (strings) faster by avoiding the cast, same perfs for the other cases
Jordi Boggiano [Mon, 6 May 2013 12:31:38 +0000]
Avoid unnecessary is_object call
Jordi Boggiano [Mon, 6 May 2013 12:19:26 +0000]
Use uppercased charsets consistently (as in js/css/html_attr strategies)
Jordi Boggiano [Mon, 6 May 2013 12:15:40 +0000]
Add UTF-8 in uppercase since it is so common
Jordi Boggiano [Mon, 6 May 2013 12:12:55 +0000]
Avoid strtolower call at every twig_escape_filter call
Jordi Boggiano [Mon, 6 May 2013 12:09:40 +0000]
Use plain string comparison which is twice as fast
Jordi Boggiano [Mon, 6 May 2013 12:01:58 +0000]
Move html case up since it is the most likely to be hit
Fabien Potencier [Mon, 6 May 2013 06:36:47 +0000]
merged branch lyrixx/patch-1 (PR #1075)
This PR was merged into the master branch.
Discussion
----------
Fixed php doc in Twig/Extension/StringLoader
Commits
-------
95353cb Fixed php doc in Twig/Extension/StringLoader
Fabien Potencier [Sun, 5 May 2013 09:25:56 +0000]
merged branch Seldaek/optim (PR #1074)
This PR was merged into the master branch.
Discussion
----------
Optimize initGlobals to do only one merge call
Commits
-------
086088e Optimize initGlobals to do only one merge call
Grégoire Pineau [Sun, 5 May 2013 09:13:56 +0000]
Fixed php doc in Twig/Extension/StringLoader
Jordi Boggiano [Sat, 4 May 2013 20:18:16 +0000]
Optimize initGlobals to do only one merge call
Fabien Potencier [Wed, 1 May 2013 19:03:39 +0000]
Merge pull request #1073 from fabpot/special-chars
changed ☃ to § in tests (closes #996)
Fabien Potencier [Wed, 1 May 2013 18:32:42 +0000]
changed ☃ to § in tests (closes #996)
Fabien Potencier [Wed, 1 May 2013 18:28:29 +0000]
fixed a unit test when run in isolation
Fabien Potencier [Wed, 1 May 2013 18:10:14 +0000]
merged branch fabpot/named-args (PR #1072)
This PR was merged into the master branch.
Discussion
----------
enforced usage of named arguments after positional ones
When we introduced named arguments, the behavior for when both positional and named arguments were used in a call was not clearly defined.
This PR addresses this issue by following Python rules:
* No positional argument after named ones
* No possibility to define an argument with both a positional argument and a named one
This introduces a BC break if people were using positional arguments after named ones, but I would argue that this is never a good idea anyway.
This is an alternative to #995
Commits
-------
135b618 enforced usage of named arguments after positional ones
Fabien Potencier [Wed, 1 May 2013 06:13:09 +0000]
enforced usage of named arguments after positional ones
Fabien Potencier [Wed, 1 May 2013 08:03:10 +0000]
added a precedence example (refs #1057)
Fabien Potencier [Wed, 1 May 2013 06:53:54 +0000]
added missing operators in the precedence docs (closes #1057)
Fabien Potencier [Wed, 1 May 2013 06:42:32 +0000]
fixed the autoloader for PHP 5.2
Fabien Potencier [Wed, 1 May 2013 05:10:30 +0000]
simplified code
Fabien Potencier [Wed, 1 May 2013 05:08:24 +0000]
merged branch hason/tests_autoloader (PR #994)
This PR was merged into the master branch.
Discussion
----------
Fixed autoloader registration for tests if phpunit is installed as package together with Twig
Commits
-------
19869ce Fixed autoloader registration for tests if phpunit is installed as package together with Twig
Fabien Potencier [Wed, 1 May 2013 04:57:38 +0000]
tweaked docs for the set tag (closes #1029)
Fabien Potencier [Wed, 1 May 2013 04:48:52 +0000]
merged branch include-x/master (PR #1068)
This PR was merged into the master branch.
Discussion
----------
Fixes typo in documentation, "if" tag
Commits
-------
da635ba Fixes typo
Sema [Sat, 27 Apr 2013 15:59:05 +0000]
Fixes typo
Fabien Potencier [Fri, 26 Apr 2013 09:34:36 +0000]
removed obsolete call to ini_set
Fabien Potencier [Wed, 24 Apr 2013 14:49:01 +0000]
merged branch lyrixx/feat-cli (PR #1062)
This PR was merged into the master branch.
Discussion
----------
Debug extension is safe in a cli context
Commits
-------
08b4a73 Debug extension is safe in a cli context
Fabien Potencier [Wed, 24 Apr 2013 14:31:03 +0000]
merged branch jezhalford/patch-1 (PR #1067)
This PR was merged into the master branch.
Discussion
----------
Made macro documentation clearer
Previous wording implied (to me at least) that macros *are* PHP functions.
Commits
-------
c155932 Made macro doc clearer
Jez Halford [Wed, 24 Apr 2013 14:03:23 +0000]
Made macro doc clearer
Previous wording implied (to me at least) that macros *are* PHP functions.
Martin Hasoň [Tue, 12 Feb 2013 08:12:17 +0000]
Fixed autoloader registration for tests if phpunit is installed as package together with Twig
Grégoire Pineau [Sun, 21 Apr 2013 14:30:55 +0000]
Debug extension is safe in a cli context
Fabien Potencier [Wed, 17 Apr 2013 12:07:50 +0000]
merged branch weaverryan/patch-1 (PR #1060)
This PR was merged into the master branch.
Discussion
----------
Fixed small typo in link for "pre-built DLL"
Hey!
Very easy - this fixes a link that wasn't generating correctly.
Thanks!
Commits
-------
28673b1 Fixed small typo in link for "pre-built DLL"
Ryan Weaver [Wed, 17 Apr 2013 12:01:55 +0000]
Fixed small typo in link for "pre-built DLL"
This fixes a link that wasn't generating correctly.
Fabien Potencier [Mon, 15 Apr 2013 09:43:17 +0000]
merged branch cordoval/patch-2 (PR #1056)
This PR was merged into the master branch.
Discussion
----------
improve readability
Commits
-------
a4daa4c update
6a25c5d improve readability
Luis Cordova [Sat, 13 Apr 2013 17:53:49 +0000]
update
Luis Cordova [Sat, 13 Apr 2013 17:42:07 +0000]
improve readability
Fabien Potencier [Sat, 13 Apr 2013 06:32:43 +0000]
merged branch jibriss/fix_defined (PR #1051)
This PR was merged into the master branch.
Discussion
----------
Fixed : fatal error when using defined test on an invalid expression
Commits
-------
e285228 Fixed : fatal error when using defined test on an invalid expression
Fabien Potencier [Sat, 13 Apr 2013 06:32:05 +0000]
merged branch cordoval/patch-2 (PR #1055)
This PR was merged into the master branch.
Discussion
----------
typo
Commits
-------
e3b9e99 typo
Luis Cordova [Sat, 13 Apr 2013 05:37:28 +0000]
typo
Fabien Potencier [Fri, 12 Apr 2013 09:46:40 +0000]
merged branch drewjw81/extension_global_fix (PR #1053)
This PR was squashed before being merged into the master branch (closes #1053).
Discussion
----------
Prevent extensions from clobbering all globals.
It's possible for a poorly written extension to destroy all global variables by returning nothing. This prevents that and throws an E_WARNING to notify the developer.
Commits
-------
7c8acf7 Prevent extensions from clobbering all globals.
Andrew Winter [Fri, 12 Apr 2013 01:57:33 +0000]
Prevent extensions from clobbering all globals.
Fabien Potencier [Tue, 9 Apr 2013 16:55:44 +0000]
removed unused variable
Jerome Brissonnet [Mon, 8 Apr 2013 20:43:53 +0000]
Fixed : fatal error when using defined test on an invalid expression
Tobias Schultze [Mon, 8 Apr 2013 20:36:24 +0000]
Merge pull request #3 from tucksaun/patch-1
Updating C extension
Tugdual Saunier [Mon, 8 Apr 2013 14:42:05 +0000]
[ext] fixed tabs
Tugdual Saunier [Mon, 1 Apr 2013 16:24:17 +0000]
[ext] improvements
Tugdual Saunier [Wed, 3 Apr 2013 06:48:12 +0000]
[ext] code cleaning
Tugdual Saunier [Tue, 26 Mar 2013 18:43:30 +0000]
[ext] updated PHP code documenting C code
Fabien Potencier [Mon, 8 Apr 2013 13:07:19 +0000]
bumped version to 1.12.4-DEV
Fabien Potencier [Mon, 8 Apr 2013 12:40:11 +0000]
prepared the 1.12.2 release
Fabien Potencier [Mon, 8 Apr 2013 12:30:59 +0000]
updated CHANGELOG for previous commit
Rick Prent [Fri, 8 Mar 2013 13:16:10 +0000]
Fixed twig filesystemloader security issue + test (closes #1026)
Fabien Potencier [Mon, 8 Apr 2013 12:11:21 +0000]
tweaked previous merge
Fabien Potencier [Mon, 8 Apr 2013 12:10:12 +0000]
merged branch ThatGuyBen/patch-1 (PR #1048)
This PR was merged into the master branch.
Discussion
----------
Update json_encode.rst
a more-useful description of the "options" argument >_>
Commits
-------
742043f Update json_encode.rst
Ben [Mon, 1 Apr 2013 21:30:05 +0000]
Update json_encode.rst
a more-useful description of the "options" argument >_>
Fabien Potencier [Mon, 1 Apr 2013 08:27:18 +0000]
updated CHANGELOG
Fabien Potencier [Mon, 1 Apr 2013 08:26:39 +0000]
merged branch ShadowPrince/master (PR #1042)
This PR was squashed before being merged into the master branch (closes #1042).
Discussion
----------
Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error:
$environment->addFunction(new Twig_SimpleFunction(...))
after
$environment->render(...)
throws Fatal Error:
object of Twig_SimpleFunction could not be converted to string
Commits
-------
92e97b9 Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
Vasiliy Horbachenko [Tue, 26 Mar 2013 01:33:16 +0000]
Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
Fabien Potencier [Mon, 25 Mar 2013 07:43:31 +0000]
tweaked previous merge
Fabien Potencier [Mon, 25 Mar 2013 07:42:48 +0000]
merged branch beryllium/patch-1 (PR #1032)
This PR was merged into the master branch.
Discussion
----------
Adding a section about the slice filter to doc/tags/for.rst
This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")
Commits
-------
202641a Adding link to slice filter per Stof's suggestion
8ebbaaa Adding a section about the slice filter
Fabien Potencier [Mon, 25 Mar 2013 07:41:44 +0000]
merged branch ricardclau/typo_sort_doc (PR #1039)
This PR was merged into the master branch.
Discussion
----------
Minor typo in sort filter documentation
I've found this small typo while working on shuffle filter documentation in https://github.com/fabpot/Twig/pull/1038
I decided to create separate PR in case https://github.com/fabpot/Twig/pull/1038 got rejected
Best regards!
Commits
-------
1443b76 minor typo in sort documentation
Fabien Potencier [Mon, 25 Mar 2013 07:41:31 +0000]
merged branch tommygnr/fix-docs-batch-filter (PR #1040)
This PR was merged into the master branch.
Discussion
----------
Fix filename for batch filter documentation
The documentation on the website for the batch filter currently 404s See: http://twig.sensiolabs.org/doc/filters/batch.html
I believe this is because the filename is incorrect. This PR fixes that.
Commits
-------
bb05942 Fix filename for batch filter documentation