Commit Graph

2548 Commits

Author SHA1 Message Date
Fabien Potencier 1ded65daeb fixed CS 2015-07-05 10:50:23 +02:00
Fabien Potencier 0828c0345a tweaked docs 2015-07-05 10:48:49 +02:00
Fabien Potencier e007c178ec feature #1699 Added variadic filters, tests, and functions (hason)
This PR was merged into the 1.x branch.

Discussion
----------

Added variadic filters, tests, and functions

Replaces #1317

```php
$env->addFunction(new Twig_SimpleFunction('foo', function ($a1, array $args = array()) {
}, array('is_variadic' => true));
```
```jinja
{{ foo(1, 2, a="a", b="b") }}
{# foo(1, array(0 => 2, "a" => "a", "b" => "b")); #}
```

Commits
-------

c78656a Added variadic filters, tests, and functions
2015-07-05 10:27:16 +02:00
Fabien Potencier 056bb5dade fixed CS 2015-07-05 10:26:11 +02:00
Fabien Potencier ea2648768e bumped version to 1.19 2015-07-05 10:14:03 +02:00
Fabien Potencier 5020747987 feature #1659 Added support for unconsumed macro arguments (hason)
This PR was merged into the 1.x branch.

Discussion
----------

Added support for unconsumed macro arguments

Fixes #1159 and supplements #1699

Commits
-------

7f00cb9 Added support for unconsumed macro arguments
2015-07-05 10:12:21 +02:00
Fabien Potencier 82636dc93d fixed PHP 5.2 compat 2015-07-03 12:11:52 +02:00
Fabien Potencier 641090378d tweaked previous merge 2015-07-03 11:46:19 +02:00
Fabien Potencier 35790250b8 bug #1666 add ignore_missing agrument to source function (vetruvet)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1666).

Discussion
----------

add ignore_missing agrument to source function

This basically works the same way as `ignore_missing` on the `include` function/tag.

Commits
-------

afa9358 add ignore_missing agrument to source function
2015-07-03 11:44:24 +02:00
Valeriy Trubachev afa93586bc add ignore_missing agrument to source function 2015-07-03 11:44:24 +02:00
Fabien Potencier 793ea7e37d updated CHANGELOG 2015-07-03 11:41:40 +02:00
Fabien Potencier 849adeb85e fixed edge case where tests would fail because of a cache issue 2015-07-03 11:33:17 +02:00
Fabien Potencier d472fcc9bd tweaked docs to avoid using an internal method in an example 2015-07-03 11:30:18 +02:00
Fabien Potencier 61eb80b089 deprecated Twig_Environment::clearTemplateCache() 2015-07-03 11:29:18 +02:00
Fabien Potencier 1255e360e7 bug #1725 fixed sandbox disabling when using the include function (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed sandbox disabling when using the include function

closes #1668

Commits
-------

af72894 fixed sandbox disabling when using the include function
2015-07-03 11:20:29 +02:00
Fabien Potencier af728947d6 fixed sandbox disabling when using the include function 2015-07-03 09:28:58 +02:00
Fabien Potencier 90026f3f99 minor #1720 Example about how to rename several blocks (pyguerder)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1720).

Discussion
----------

Example about how to rename several blocks

It was unclear to me how to rename more than 1 imported block. I had to look into the source code to find that, so I add it to the documentation.

Commits
-------

8af1355 Example about how to rename several blocks
2015-07-03 09:00:14 +02:00
Pierre-Yves Guerder 8af1355e43 Example about how to rename several blocks
It was unclear to me how to rename more than 1 imported block. I had to look into the source code to find that, so I add it to the documentation.
2015-07-03 09:00:13 +02:00
Fabien Potencier 7823014351 fixed docs 2015-07-03 08:59:01 +02:00
Fabien Potencier 1ee34b4bd5 minor #1723 Update batch filter docs with arguments (alexeymalihin)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1723).

Discussion
----------

Update batch filter docs with arguments

Changes based on https://github.com/twigphp/Twig/blob/1.x/test/Twig/Tests/Fixtures/filters/batch_float.test

Commits
-------

b66821e Update batch filter docs with arguments
2015-07-03 08:57:29 +02:00
Alexey Malihin b66821e861 Update batch filter docs with arguments 2015-07-03 08:57:29 +02:00
Fabien Potencier b0c41d42c4 fixed CS 2015-07-03 08:47:09 +02:00
Fabien Potencier d00943bb56 bug #1724 fix batch filter with zero items (Tobion)
This PR was merged into the 1.x branch.

Discussion
----------

fix batch filter with zero items

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

also added a test for preserving keys behavior

Commits
-------

8d6be28 fix batch filter with zero items
2015-07-03 08:37:27 +02:00
Tobias Schultze 8d6be28430 fix batch filter with zero items
also added a test for preserving keys behavior
2015-07-02 23:47:18 +02:00
Fabien Potencier ae448f3ae2 bug #1722 Fix PHP_FE_END value (remicollet)
This PR was merged into the 1.x branch.

Discussion
----------

Fix PHP_FE_END value

See explanation on rev c41d305

Commits
-------

a1eee07 Fix PHP_FE_END value
2015-07-01 16:40:16 +02:00
Remi Collet a1eee074e8 Fix PHP_FE_END value
See explanation on rev c41d305
2015-07-01 12:05:34 +02:00
Fabien Potencier 12bf70d9ad fixed CS 2015-06-24 18:24:09 +02:00
Fabien Potencier e22fb8728b bumped version to 1.18.3-DEV 2015-06-07 01:35:59 +02:00
Fabien Potencier e8e6575abf prepared the 1.18.2 release v1.18.2 2015-06-07 01:31:24 +02:00
Fabien Potencier 3e3aa8e26d updated CHANGELOG 2015-06-07 01:28:33 +02:00
Fabien Potencier b560a2c14f reverted unexpected change 2015-06-07 01:26:25 +02:00
Fabien Potencier d0b71307d6 fixed previous merge 2015-06-07 01:22:13 +02:00
Fabien Potencier 47f06e8237 minor #1624 Organize and show value types (kevinsimper)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1624).

Discussion
----------

Organize and show value types

I was a little confused about how `auto_reload` and what kind of types you had to provide. Hope this helps to clarify that for others.

Should it also say something about how `cache: true` and `auto_reload: true` works together, as that is a question i have myself :)

Commits
-------

0a46d06 Organize and show value types
2015-06-07 01:19:31 +02:00
Kevin Simper 0a46d06069 Organize and show value types 2015-06-07 01:19:31 +02:00
Fabien Potencier 69984ee652 minor #1664 Use mocks for profiles. Fixes #1660 (matthieuauger)
This PR was merged into the 1.x branch.

Discussion
----------

Use mocks for profiles. Fixes #1660

| Q             | A
| ------------- | ---
| Bug fix?      | yes #1660
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

This PR aims to change the getProfile() method to returns mocks.
This fixes #1660

BTW Is there a specific reason why there are no mocks for the tests in the project ?

Commits
-------

f6bce94 Use stubs for profiles. Fixes #1660
2015-06-07 00:23:40 +02:00
Martin Hasoň 7f00cb9d10 Added support for unconsumed macro arguments 2015-06-02 21:17:27 +02:00
Martin Hasoň c78656a8fb Added variadic filters, tests, and functions 2015-06-02 21:16:57 +02:00
Fabien Potencier dfddd2e0ef bug #1701 Fixed error guessing for nested templates (hason)
This PR was merged into the 1.x branch.

Discussion
----------

Fixed error guessing for nested templates

Commits
-------

00fe940 Fixed CS
dd1b101 Fixed error guessing for nested templates
2015-06-02 16:50:15 +02:00
Fabien Potencier c4bc409088 minor #1700 Travis no longer supports hhvm-nightly (hason)
This PR was merged into the 1.x branch.

Discussion
----------

Travis no longer supports hhvm-nightly

See travis-ci/travis-ci#3788

Commits
-------

329d67c Travis no longer supports hhvm-nightly
2015-06-02 16:48:47 +02:00
Fabien Potencier 5f201abce5 minor #1703 Added note about case sensitivity of logic operators (biozshock)
This PR was merged into the 1.x branch.

Discussion
----------

Added note about case sensitivity of logic operators

Commits
-------

29986a9 Added note about case sensitivity of logic operators
2015-06-02 16:47:56 +02:00
Ulf df9da8e858 Added label for "Whitespace Control" section 2015-06-02 16:46:05 +02:00
Artem Lopata 29986a9c4c Added note about case sensitivity of logic operators 2015-06-02 15:11:17 +03:00
Martin Hasoň 00fe940ebf Fixed CS 2015-06-02 11:21:27 +02:00
Martin Hasoň dd1b1016a7 Fixed error guessing for nested templates 2015-06-02 11:19:07 +02:00
Martin Hasoň 329d67c4bb Travis no longer supports hhvm-nightly 2015-06-02 10:05:33 +02:00
Fabien Potencier d63ac2088e minor #1667 [1.x] Updated exception messages for null vars (phansys)
This PR was merged into the 1.x branch.

Discussion
----------

[1.x] Updated exception messages for null vars

Updated exception messages for null vars in ```Twig_Template::getAttribute()```.

Example:
**Before:**
```
Impossible to invoke a method ("myMethod") on a NULL variable ("") in My:template.html.twig at line 1
```

**After:**
```
Impossible to invoke a method ("myMethod") on a null variable in My:template.html.twig at line 1
```

Commits
-------

ddf011d Updated exception messages for null vars in Twig_Template::getAttribute().
2015-05-16 16:17:41 +02:00
Fabien Potencier c55e60394c fixed CS 2015-05-16 16:14:08 +02:00
Fabien Potencier 5b43c44cae minor #1669 Added an example for "and" on if statment (InFog)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1669).

Discussion
----------

Added an example for "and" on if statment

Commits
-------

2698a42 Added an example for "and" on if statment
2015-05-16 16:13:37 +02:00
Evaldo Junior 2698a42284 Added an example for "and" on if statment 2015-05-16 16:13:37 +02:00
Fabien Potencier ca76ad98b9 minor #1678 PHP docs and unused code clean ups (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

PHP docs and unused code clean ups

Commits
-------

2030482 clean ups
2015-05-16 16:09:19 +02:00