Commit Graph

2094 Commits

Author SHA1 Message Date
Fabien Potencier 76283cc37b 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"
2013-10-03 08:23:32 +02:00
Fabien Potencier 74586e9f08 Revert "merged branch hason/macros (PR #1139)"
This reverts commit 03926034c4, reversing
changes made to 730aa25bed.

Conflicts:
	CHANGELOG
	doc/tags/macro.rst
	doc/templates.rst
	lib/Twig/ExpressionParser.php
2013-10-02 21:50:59 +02:00
Fabien Potencier bf40fa3d79 Revert "updated CHANGELOG"
This reverts commit 7ffca6c735.

Conflicts:
	CHANGELOG
2013-10-02 21:48:06 +02:00
Fabien Potencier c3e05f3bac Revert "added an exception when a macro re-uses the same argument name twice"
This reverts commit b7a54b0101.
2013-10-02 21:46:45 +02:00
Fabien Potencier 524e4062b5 Revert "renamed an internal variable"
This reverts commit a176fadc04.
2013-10-02 21:46:38 +02:00
Fabien Potencier 60b575f979 Revert "fixed some unit tests"
This reverts commit 120518d803.
2013-10-02 21:46:31 +02:00
Fabien Potencier 606f88b1bc 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
2013-10-02 21:38:09 +02:00
Fabien Potencier b66181d1c5 added the starts with, ends with, and matches operators 2013-10-02 21:13:57 +02:00
Fabien Potencier c579a81414 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
2013-10-02 07:57:25 +02:00
Fabien Potencier f23031a8e5 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
2013-10-01 16:20:58 +02:00
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
Nicolas Bastien fc1950d5a9 [Doc] corrects number_format argument namming 2013-09-29 16:14:18 +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
Matthew Davis 435e3b2a85 Update wording of the indentation coding standards documentation 2013-09-27 16:32:11 +01:00
Matthew Davis 09b58e1423 Change wording of indentation coding standards 2013-09-27 15:57:10 +01: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