Fabien Potencier [Thu, 31 Oct 2013 12:17:35 +0000]
Revert "merged branch Cottser/master (PR #1071)"
This reverts commit
2f5c9899a4088fce3bb6325d96232cd1978161e4, reversing
changes made to
4e7094f6a3831dc86b4963d805c4567f4076fce3.
Conflicts:
lib/Twig/Environment.php
Fabien Potencier [Thu, 31 Oct 2013 11:37:11 +0000]
bug #1256 Fixed C extension sandbox behavior (tucksaun)
This PR was squashed before being merged into the master branch (closes #1256).
Discussion
----------
Fixed C extension sandbox behavior
fixes #1254
Commits
-------
40bba0e Fixed C extension sandbox behavior
Tugdual Saunier [Thu, 31 Oct 2013 11:13:00 +0000]
Fixed C extension sandbox behavior
Fabien Potencier [Wed, 30 Oct 2013 08:31:01 +0000]
bumped version to 1.14.3-DEV
Fabien Potencier [Wed, 30 Oct 2013 08:20:53 +0000]
prepared the 1.14.2 release
Fabien Potencier [Mon, 28 Oct 2013 13:44:04 +0000]
added missing @throws
Fabien Potencier [Mon, 28 Oct 2013 13:36:23 +0000]
bug #1249 fixed error filename/line when an error occurs in an included file (fabpot)
This PR was merged into the master branch.
Discussion
----------
fixed error filename/line when an error occurs in an included file
fixed #1141
Commits
-------
ba0bf63 refactored some tests
1cdc913 fixed error filename/line when an error occurs in an included file
de985a8 failing test
Fabien Potencier [Mon, 28 Oct 2013 10:44:48 +0000]
feature #1208 allowed tests to be made of 1 or 2 words (fabpot)
This PR was merged into the master branch.
Discussion
----------
allowed tests to be made of 1 or 2 words
Commits
-------
52c952c allowed tests to be made of 1 or 2 words
Fabien Potencier [Mon, 28 Oct 2013 10:43:01 +0000]
bug #1248 allowed operators that contain whitespaces to have more than one whitespace (fabpot)
This PR was merged into the master branch.
Discussion
----------
allowed operators that contain whitespaces to have more than one whitespace
Commits
-------
724dc61 allowed operators that contain whitespaces to have more than one whitespace
Fabien Potencier [Sun, 27 Oct 2013 18:18:00 +0000]
refactored some tests
Fabien Potencier [Sun, 27 Oct 2013 13:47:59 +0000]
fixed error filename/line when an error occurs in an included file
To be able to cover all cases, we need to catch the exception when we
know the execution context (the block being rendered). The only
possibility is to actually try/catch exceptions in the displayBlock()
method directly.
Kris Wallsmith [Thu, 18 Jul 2013 00:25:28 +0000]
failing test
the error filename is incorrect when an exception is thrown from an
included file
Fabien Potencier [Sat, 28 Sep 2013 17:28:24 +0000]
allowed tests to be made of 1 or 2 words
Fabien Potencier [Sun, 27 Oct 2013 09:56:11 +0000]
allowed operators that contain whitespaces to have more than one whitespace
Fabien Potencier [Sat, 26 Oct 2013 07:59:29 +0000]
removed whitespaces
Fabien Potencier [Sat, 26 Oct 2013 06:34:09 +0000]
removed whitespaces in docs
Fabien Potencier [Sat, 26 Oct 2013 06:29:21 +0000]
fixed CS in docs
Fabien Potencier [Sat, 26 Oct 2013 06:16:32 +0000]
minor #1247 Fixed minor typo "base" into "based" line 67 (annesosensio)
This PR was merged into the master branch.
Discussion
----------
Fixed minor typo "base" into "based" line 67
Commits
-------
08282d3 Fixed minor typo "base" into "based" line 67
annesosensio [Fri, 25 Oct 2013 13:23:13 +0000]
Fixed minor typo "base" into "based" line 67
Fabien Potencier [Thu, 17 Oct 2013 08:34:06 +0000]
minor #1237 missing closing parenthesis (karlhorky)
This PR was merged into the master branch.
Discussion
----------
missing closing parenthesis
Commits
-------
9b73224 missing closing parenthesis
Karl Horky [Thu, 17 Oct 2013 08:00:32 +0000]
missing closing parenthesis
Fabien Potencier [Tue, 15 Oct 2013 19:39:15 +0000]
bumped version to 1.14.2-DEV
Fabien Potencier [Tue, 15 Oct 2013 19:17:38 +0000]
prepared the 1.14.1 release
Fabien Potencier [Tue, 15 Oct 2013 16:44:00 +0000]
feature #1235 made it possible to use named operators as variables (fabpot)
This PR was merged into the master branch.
Discussion
----------
made it possible to use named operators as variables
Commits
-------
8d805aa made it possible to use named operators as variables
Fabien Potencier [Tue, 15 Oct 2013 16:27:17 +0000]
made it possible to use named operators as variables
Fabien Potencier [Tue, 15 Oct 2013 16:09:36 +0000]
fixed the possibility to have a variable named 'matches' (closes #1227)
Fabien Potencier [Tue, 15 Oct 2013 15:54:43 +0000]
minor #1231 fix phpdoc for environment, lexer and parser (Tobion)
This PR was squashed before being merged into the master branch (closes #1231).
Discussion
----------
fix phpdoc for environment, lexer and parser
First commit fixes several phpdocs <del>and also an instanceof check</del>.
The second commit changes an exception from Runtime to Syntax because it doesn't make sense to throw runtime exception during compilation. It also makes it consistent with all the rest (lexer, parser, compiler classes).
Commits
-------
cc5f3c4 fix phpdoc for environment, lexer and parser
Tobias Schultze [Wed, 9 Oct 2013 22:52:04 +0000]
fix phpdoc for environment, lexer and parser
Fabien Potencier [Tue, 15 Oct 2013 15:51:49 +0000]
made a cosmetic change (closes #1226)
Fabien Potencier [Tue, 15 Oct 2013 15:50:35 +0000]
updated CHANGELOG
Fabien Potencier [Tue, 15 Oct 2013 15:50:14 +0000]
feature #1234 Added support DateTimeInterface (PHP 5.5) if available (hidenorigoto)
This PR was squashed before being merged into the master branch (closes #1234).
Discussion
----------
Added support DateTimeInterface (PHP 5.5) if available
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | new BSD
| Doc PR |
Commits
-------
ca61fac Added support DateTimeInterface (PHP 5.5) if available
hidenorigoto [Tue, 15 Oct 2013 09:17:03 +0000]
Added support DateTimeInterface (PHP 5.5) if available
Fabien Potencier [Mon, 7 Oct 2013 10:00:50 +0000]
git push #1225 Fixed minor typo (deguif)
This PR was merged into the master branch.
Discussion
----------
Fixed minor typo
Commits
-------
c05c2e1 Fixed minor typo
deguif [Mon, 7 Oct 2013 09:50:40 +0000]
Fixed minor typo
Fabien Potencier [Fri, 4 Oct 2013 14:13:23 +0000]
bug #1222 Do not repeat dirname function execution in writing cache files (glutamatt)
This PR was merged into the master branch.
Discussion
----------
Do not repeat dirname function execution in writing cache files
Commits
-------
a9870f4 Do not repeat dirname function execution in writing cache files
glutamatt [Fri, 4 Oct 2013 13:40:25 +0000]
Do not repeat dirname function execution in writing cache files
Fabien Potencier [Fri, 4 Oct 2013 05:55:42 +0000]
minor #1220 Update grammar of internals.rst (steveoliver)
This PR was merged into the master branch.
Discussion
----------
Update grammar of internals.rst
Fabien,
Here are some changes that I think help the Internals docs page read easier.
Commits
-------
6c80601 Update grammar of internals.rst
Steve Oliver [Fri, 4 Oct 2013 05:15:48 +0000]
Update grammar of internals.rst
Some changes that I think help the docs read easier.
Fabien Potencier [Thu, 3 Oct 2013 07:19:21 +0000]
bumped version to 1.14.1-DEV
Fabien Potencier [Thu, 3 Oct 2013 06:41:13 +0000]
prepared the 1.14.0 release
Fabien Potencier [Thu, 3 Oct 2013 06:23:32 +0000]
feature #1215 Macros changes removal (fabpot)
This PR was merged into the master branch.
Discussion
----------
Macros changes removal
This PR reverts the changes made to macros in 1.14.
The initial PR looked massive and I was not comfortable with the changes, but I merged it anyways. But the latest PR about fixes some bugs in the implementation -- and adding some more changes (#1213) really scares me.
So, instead of continuing doing big changes, I prefer to revert everything for now, release 1.14 and give more time for these changes to mature and eventually be merged again.
Commits
-------
74586e9 Revert "merged branch hason/macros (PR #1139)"
bf40fa3 Revert "updated CHANGELOG"
c3e05f3 Revert "added an exception when a macro re-uses the same argument name twice"
524e406 Revert "renamed an internal variable"
60b575f Revert "fixed some unit tests"
Fabien Potencier [Wed, 2 Oct 2013 19:50:59 +0000]
Revert "merged branch hason/macros (PR #1139)"
This reverts commit
03926034c452bbf7f3bcc14dd167acf39bb33818, reversing
changes made to
730aa25bedeee922c361640f6e4c01e4e6bac998.
Conflicts:
CHANGELOG
doc/tags/macro.rst
doc/templates.rst
lib/Twig/ExpressionParser.php
Fabien Potencier [Wed, 2 Oct 2013 19:48:06 +0000]
Revert "updated CHANGELOG"
This reverts commit
7ffca6c735bec4d37186ed10162134c978160f17.
Conflicts:
CHANGELOG
Fabien Potencier [Wed, 2 Oct 2013 19:46:45 +0000]
Revert "added an exception when a macro re-uses the same argument name twice"
This reverts commit
b7a54b01017becf7f3b90beadc71536b58e2299a.
Fabien Potencier [Wed, 2 Oct 2013 19:46:38 +0000]
Revert "renamed an internal variable"
This reverts commit
a176fadc042bbfa09b0f304bef9ec89850f6e06f.
Fabien Potencier [Wed, 2 Oct 2013 19:46:31 +0000]
Revert "fixed some unit tests"
This reverts commit
120518d80336efdb1641f9e61f5c2b46d13988de.
Fabien Potencier [Wed, 2 Oct 2013 19:38:09 +0000]
feature #1209 added the starts with, ends with, and matches operators (fabpot)
This PR was merged into the master branch.
Discussion
----------
added the starts with, ends with, and matches operators
Adds three new operators:
* `ends with`
* `starts with`
* `matches`
I've not added the `contains` operator as it would be equivalent with the existing `in` one.
TODO:
* [x] add docs
* [x] fix on PHP 5.2.
Commits
-------
b66181d added the starts with, ends with, and matches operators
Fabien Potencier [Sun, 29 Sep 2013 07:40:36 +0000]
added the starts with, ends with, and matches operators
Fabien Potencier [Wed, 2 Oct 2013 05:57:25 +0000]
minor #1203 Change wording of indentation coding standards (mdavis1982)
This PR was merged into the master branch.
Discussion
----------
Change wording of indentation coding standards
The documentation says to use indentation consistent with the main language of the **File**. But in a Twig template, that language is going to be Twig. This PR changes the wording to indicate that the indentation rules inside tags should be consistent with the main language of the **Project** Twig is being used within.
```
| Q | A
| ------------- | ---
| Doc fix? | yes
| New docs? | no
| Applies to | all
| Fixed tickets | none
```
Commits
-------
435e3b2 Update wording of the indentation coding standards documentation
09b58e1 Change wording of indentation coding standards
Fabien Potencier [Tue, 1 Oct 2013 14:20:58 +0000]
minor #1210 [Doc] corrects number_format argument namming (nicolas-bastien)
This PR was merged into the master branch.
Discussion
----------
[Doc] corrects number_format argument namming
last argument is for thousand separator not decimal
Commits
-------
fc1950d [Doc] corrects number_format argument namming
Fabien Potencier [Tue, 1 Oct 2013 14:20:20 +0000]
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
Fabien Potencier [Tue, 1 Oct 2013 13:11:00 +0000]
fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy
Nicolas Bastien [Sun, 29 Sep 2013 14:14:18 +0000]
[Doc] corrects number_format argument namming
Fabien Potencier [Sun, 29 Sep 2013 07:27:48 +0000]
simplified code
Fabien Potencier [Sat, 28 Sep 2013 11:31:14 +0000]
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
Fabien Potencier [Sat, 28 Sep 2013 11:30:35 +0000]
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()
Fabien Potencier [Thu, 19 Sep 2013 12:12:28 +0000]
removed a test that do not pass on hhvm as it is not able to compare DateTime objects properly
Fabien Potencier [Thu, 19 Sep 2013 11:44:08 +0000]
fixed a test on hhvm
Fabien Potencier [Thu, 19 Sep 2013 11:41:36 +0000]
skipped a test on hhvm
Fabien Potencier [Thu, 19 Sep 2013 11:41:22 +0000]
fixed some tests as hhvm always returns false for ReflectionArgument::isOptional()
Fabien Potencier [Thu, 19 Sep 2013 11:43:59 +0000]
made escaping work on hhvm
Fabien Potencier [Sat, 28 Sep 2013 11:15:51 +0000]
updated CHANGELOG
Fabien Potencier [Thu, 19 Sep 2013 12:01:05 +0000]
fixed a test on hhvm
Fabien Potencier [Thu, 19 Sep 2013 11:43:44 +0000]
fixed error management as hhvm returns a directory in a stacktrace when the file is eval'ed (more like a hack than anything else)
Fabien Potencier [Sat, 28 Sep 2013 08:50:34 +0000]
tweaked intro chapter
Fabien Potencier [Sat, 28 Sep 2013 08:25:36 +0000]
simplified the intro doc page
Fabien Potencier [Sat, 28 Sep 2013 06:26:47 +0000]
removed Travis badge
Fabien Potencier [Fri, 27 Sep 2013 20:04:22 +0000]
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
Mateusz Zakarczemny [Thu, 26 Sep 2013 08:19:13 +0000]
Missing doc details for building C extension on windows
Fabien Potencier [Fri, 27 Sep 2013 19:58:41 +0000]
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
Matthew Davis [Fri, 27 Sep 2013 15:32:11 +0000]
Update wording of the indentation coding standards documentation
Matthew Davis [Fri, 27 Sep 2013 14:57:10 +0000]
Change wording of indentation coding standards
Fabien Potencier [Fri, 20 Sep 2013 20:40:25 +0000]
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
Grégoire Pineau [Fri, 20 Sep 2013 15:27:06 +0000]
Fixed somes issues from SensioLabsInsight
Fabien Potencier [Thu, 19 Sep 2013 11:52:03 +0000]
fixed CS
Fabien Potencier [Tue, 17 Sep 2013 13:39:25 +0000]
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
Fabien Potencier [Tue, 17 Sep 2013 07:54:50 +0000]
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
unkind [Tue, 17 Sep 2013 07:34:02 +0000]
Add "cols" parameter to the textarea macro
Macro textarea depends on cols variable, but there is no way to pass it.
javer [Sun, 15 Sep 2013 18:42:04 +0000]
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.
Fabien Potencier [Wed, 11 Sep 2013 17:30:05 +0000]
added a way to add custom escaping strategies
Fabien Potencier [Sun, 8 Sep 2013 15:21:02 +0000]
updated CHANGELOG
Fabien Potencier [Fri, 6 Sep 2013 10:25:58 +0000]
fixed markup
Fabien Potencier [Fri, 6 Sep 2013 10:25:04 +0000]
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
Tugdual Saunier [Fri, 6 Sep 2013 10:05:05 +0000]
Added doc for building C extension on windows
Tugdual Saunier [Fri, 6 Sep 2013 09:34:45 +0000]
Removed link to pre-build DLL for windows as they are outdated
Fabien Potencier [Wed, 4 Sep 2013 15:00:30 +0000]
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
Peter Kokot [Wed, 4 Sep 2013 14:57:27 +0000]
Vim integration updated with alternative, Jinja for Vim link updated to the latest
Fabien Potencier [Wed, 4 Sep 2013 06:20:08 +0000]
fixed CS
Fabien Potencier [Wed, 4 Sep 2013 06:19:53 +0000]
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
Fabien Potencier [Wed, 4 Sep 2013 06:02:07 +0000]
merged branch Tobion/simplify-constructor (PR #1181)
This PR was merged into the master branch.
Discussion
----------
simplify loader constructors
Commits
-------
ac23cd7 simplify loader constructors
Tobias Schultze [Tue, 3 Sep 2013 23:09:57 +0000]
simplify loader constructors
Uplink03 [Tue, 3 Sep 2013 15:25:30 +0000]
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.
Fabien Potencier [Mon, 2 Sep 2013 13:50:59 +0000]
removed unneeded variable
Fabien Potencier [Mon, 2 Sep 2013 12:28:12 +0000]
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
1b0a54189c859af577954dc03ea2f41faf5dd834
Commits
-------
8410f8c Added Tests to prevent future regression
Grégoire Pineau [Sat, 31 Aug 2013 23:06:11 +0000]
Added Tests to prevent future regression
Fabien Potencier [Wed, 28 Aug 2013 06:01:53 +0000]
fixed markup
Fabien Potencier [Wed, 28 Aug 2013 06:01:30 +0000]
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
Katherine Senzee [Tue, 27 Aug 2013 22:39:22 +0000]
grammar and punctuation fixes
Fabien Potencier [Mon, 26 Aug 2013 08:23:34 +0000]
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)
Tugdual Saunier [Thu, 22 Aug 2013 16:27:52 +0000]
[ext] Fixed Windows compatibility (closes #1167)
projects / web/konrad/twig.git / log