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,081 Commits 10 Branches 273 Tags
c5e4b15dbfe318f015e35b657bcbf12dffe4ccd4
Commit Graph

2081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier c5e4b15dbf bug #1211 fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy (fabpot) 
This PR was merged into the master branch.

Discussion
----------

fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy

fixes #896

Commits
-------

f27d4a1 fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy
 2013-10-01 16:20:20 +02:00
Fabien Potencier f27d4a1440 fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy 2013-10-01 15:11:00 +02:00
Fabien Potencier a0abed01eb simplified code 2013-09-29 09:27:48 +02:00
Fabien Potencier 5d67e0eaa4 minor#1206 Refactored the installation docs (fabpot) 
This PR was merged into the master branch.

Discussion
----------

Refactored the installation docs

The idea is to get back a simple and straight to the point into chapter. As Composer is now the defacto standard to install PHP deps, I've moved everything related to the other installation methods in a new chapter.

Commits
-------

dd1ead2 tweaked intro chapter
a0efdc9 simplified the intro doc page
 2013-09-28 13:31:14 +02:00
Fabien Potencier d41fc42a23 bug#1194 Make Twig HHVM compatible (fabpot) 
This PR was merged into the master branch.

Discussion
----------

Make Twig HHVM compatible

Work in progress

Commits
-------

7a7e8c5 removed a test that do not pass on hhvm as it is not able to compare DateTime objects properly
89779bc fixed a test on hhvm
f939ea6 skipped a test on hhvm
cbbcd89 fixed some tests as hhvm always returns false for ReflectionArgument::isOptional()
 2013-09-28 13:30:35 +02:00
Fabien Potencier 7a7e8c534d removed a test that do not pass on hhvm as it is not able to compare DateTime objects properly 2013-09-28 13:29:47 +02:00
Fabien Potencier 89779bcf9a fixed a test on hhvm 2013-09-28 13:29:47 +02:00
Fabien Potencier f939ea6b61 skipped a test on hhvm 2013-09-28 13:27:49 +02:00
Fabien Potencier cbbcd89206 fixed some tests as hhvm always returns false for ReflectionArgument::isOptional() 2013-09-28 13:27:49 +02:00
Fabien Potencier 7ba4a429e2 made escaping work on hhvm 2013-09-28 13:27:04 +02:00
Fabien Potencier 0046715e2f updated CHANGELOG 2013-09-28 13:15:51 +02:00
Fabien Potencier bd063068c8 fixed a test on hhvm 2013-09-28 13:15:04 +02:00
Fabien Potencier 3b1f4f84fb fixed error management as hhvm returns a directory in a stacktrace when the file is eval'ed (more like a hack than anything else) 2013-09-28 13:14:22 +02:00
Fabien Potencier dd1ead2323 tweaked intro chapter 2013-09-28 10:52:29 +02:00
Fabien Potencier a0efdc988e simplified the intro doc page 2013-09-28 10:52:00 +02:00
Fabien Potencier 337ed91b0f removed Travis badge 2013-09-28 08:26:47 +02:00
Fabien Potencier 98aaffddcf minor#1202 Missing doc details for building C extension on windows (Matzz) 
This PR was squashed before being merged into the master branch (closes #1202).

Discussion
----------

Missing doc details for building C extension on windows

Commits
-------

1a65132 Missing doc details for building C extension on windows
 2013-09-27 22:04:22 +02:00
Mateusz Zakarczemny 1a65132f06 Missing doc details for building C extension on windows 2013-09-27 22:04:22 +02:00
Fabien Potencier f5da56ff68 feature#1189 added a way to add custom escaping strategies (fabpot) 
This PR was merged into the master branch.

Discussion
----------

added a way to add custom escaping strategies

This adds the possibility to define custom escapers that can be used with the `escape` filter.

That would close #1178 and #1177, but I'm not sure that this is a good idea.

What do you think?

Commits
-------

55f8b27 added a way to add custom escaping strategies
 2013-09-27 21:58:41 +02:00
Fabien Potencier d827c601e3 merged branch lyrixx/insight (PR #1196) 
This PR was merged into the master branch.

Discussion
----------

Fixed somes issues from SensioLabsInsight

All others errors could be ignore IMHO
And the `Test` directory should be ignored in the project configuration

Commits
-------

e0da5cc Fixed somes issues from SensioLabsInsight
 2013-09-20 22:40:25 +02:00
Grégoire Pineau e0da5ccee7 Fixed somes issues from SensioLabsInsight 2013-09-20 22:12:04 +02:00
Fabien Potencier 00ecabf1b0 fixed CS 2013-09-19 13:52:25 +02:00
Fabien Potencier 0d97eb9528 merged branch javer/hhvm-array-traversable (PR #1192) 
This PR was merged into the master branch.

Discussion
----------

HHVM compatibility: array sometimes can be Traversable

All checks on instance of Traversable prepended with is_object check.

See facebook/hiphop-php#1034 for details.

Commits
-------

b1b1e3c HHVM compatibility: array sometimes can be Traversable
 2013-09-17 15:39:25 +02:00
Fabien Potencier 4fcaf0c5fc merged branch unkind/master (PR #1193) 
This PR was merged into the master branch.

Discussion
----------

Add "cols" parameter to the textarea macro

Macro textarea depends on cols variable, but there is no way to pass it.

Commits
-------

c735d6d Add "cols" parameter to the textarea macro
 2013-09-17 09:54:50 +02:00
unkind c735d6de7a Add "cols" parameter to the textarea macro 
Macro textarea depends on cols variable, but there is no way to pass it.
 2013-09-17 11:34:02 +04:00
javer b1b1e3c3a9 HHVM compatibility: array sometimes can be Traversable 
All checks on instance of Traversable prepended with is_object check.

See facebook/hiphop-php#1034 for details.
 2013-09-15 21:42:04 +03:00
Fabien Potencier 55f8b27e12 added a way to add custom escaping strategies 2013-09-11 20:26:15 +02:00
Fabien Potencier 4001f81a17 updated CHANGELOG 2013-09-08 17:21:02 +02:00
Fabien Potencier 1600817425 fixed markup 2013-09-06 12:25:58 +02:00
Fabien Potencier a14d0e4ac8 merged branch tucksaun/fix-doc-for-windows (PR #1186) 
This PR was merged into the master branch.

Discussion
----------

Add doc for building C extension on windows

Commits
-------

12500b3 Added doc for building C extension on windows
a53c467 Removed link to pre-build DLL for windows as they are outdated
 2013-09-06 12:25:04 +02:00
Tugdual Saunier 12500b3e1f Added doc for building C extension on windows 2013-09-06 12:05:05 +02:00
Tugdual Saunier a53c467e66 Removed link to pre-build DLL for windows as they are outdated 2013-09-06 11:34:45 +02:00
Fabien Potencier c0731335a1 merged branch peterkokot/patch-1 (PR #1184) 
This PR was merged into the master branch.

Discussion
----------

Vim integration updated

Vim integration updated with alternative, Jinja for Vim link updated to the latest.

Commits
-------

d8346d4 Vim integration updated with alternative, Jinja for Vim link updated to the latest
 2013-09-04 17:00:30 +02:00
Peter Kokot d8346d49e7 Vim integration updated with alternative, Jinja for Vim link updated to the latest 2013-09-04 16:57:27 +02:00
Fabien Potencier b5516cadf6 fixed CS 2013-09-04 08:20:08 +02:00
Fabien Potencier 3449713d4b merged branch Uplink03/patch-1 (PR #1180) 
This PR was merged into the master branch.

Discussion
----------

Clarify what the "date" filter takes as parameter

Clarify what the "date" filter takes as parameter.

I went through Twig/Extension/Core.php to figure what's happening. I haven't verified that I'm actually correct, but it looks like I am.

Commits
-------

744ad32 Clarify what the "date" filter takes as parameter
 2013-09-04 08:19:53 +02:00
Fabien Potencier f2f08e8e4b merged branch Tobion/simplify-constructor (PR #1181) 
This PR was merged into the master branch.

Discussion
----------

simplify loader constructors

Commits
-------

ac23cd7 simplify loader constructors
 2013-09-04 08:02:07 +02:00
Tobias Schultze ac23cd7ae4 simplify loader constructors 2013-09-04 01:09:57 +02:00
Uplink03 744ad32ceb Clarify what the "date" filter takes as parameter 
Clarify what the "date" filter takes as parameter.

I went through Twig/Extension/Core.php to figure what's happening. I haven't verified that I'm actually correct, but it looks like I am.
 2013-09-03 16:25:30 +01:00
Fabien Potencier ffec8ba902 removed unneeded variable 2013-09-02 15:50:59 +02:00
Fabien Potencier 427fce4d58 merged branch lyrixx/tests (PR #1179) 
This PR was squashed before being merged into the master branch (closes #1179).

Discussion
----------

Added Tests to prevent future regression

Theses tests do not pass at 1.13.0

could be linked to 1b0a54189c

Commits
-------

8410f8c Added Tests to prevent future regression
 2013-09-02 14:28:12 +02:00
Grégoire Pineau 8410f8caa9 Added Tests to prevent future regression 2013-09-02 14:28:12 +02:00
Fabien Potencier 3db6b6aeb9 fixed markup 2013-08-28 08:01:53 +02:00
Fabien Potencier eab827cb84 merged branch ksenzee/master (PR #1173) 
This PR was merged into the master branch.

Discussion
----------

grammar and punctuation fixes

Commits
-------

bd1cb91 grammar and punctuation fixes
 2013-08-28 08:01:30 +02:00
Katherine Senzee bd1cb91251 grammar and punctuation fixes 2013-08-27 15:48:13 -07:00
Fabien Potencier cacbf201af merged branch tucksaun/fix-win-compatibility (PR #1170) 
This PR was merged into the master branch.

Discussion
----------

Fixed PHP extension compilation on Windows (closes #1167)

Commits
-------

7fb10c2 [ext] Fixed Windows compatibility (closes #1167)
 2013-08-26 10:23:34 +02:00
Tugdual Saunier 7fb10c2dfa [ext] Fixed Windows compatibility (closes #1167) 2013-08-26 10:18:49 +02:00
Fabien Potencier fcf007e9a2 merged branch oktron/patch-1 (PR #1161) 
This PR was merged into the master branch.

Discussion
----------

Add missing apostrophe

Commits
-------

8d93a1e Add missing apostrophe
 2013-08-07 14:53:34 +02:00
oktron 8d93a1e454 Add missing apostrophe 2013-08-07 11:02:14 +02:00
Fabien Potencier e0fbce2fc0 updated CHANGELOG 2013-08-06 07:46:34 +02:00