Commit Graph

4008 Commits

Author SHA1 Message Date
Fabien Potencier 960e3e1fa3 minor #3430 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions (OskarStark)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions

Commits
-------

c9328ad6 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
2020-11-05 13:09:12 +01:00
Oskar Stark c9328ad613 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions 2020-11-05 13:09:07 +01:00
Fabien Potencier da30f5d939 minor #3429 Enhancement: Use GithubActions instead of Travis for tests (OskarStark)
This PR was merged into the 1.x branch.

Discussion
----------

Enhancement: Use GithubActions instead of Travis for tests

You can see the first run here: https://github.com/OskarStark/Twig/pull/3

Commits
-------

4438d4c1 Enhancement: Use GithubActions instead of Travis for tests
2020-11-05 13:06:13 +01:00
Oskar Stark 4438d4c1bb Enhancement: Use GithubActions instead of Travis for tests 2020-11-05 13:04:03 +01:00
Fabien Potencier 10ebf0c4d3 bug #3425 Fix odd not working for negative numbers (harrybournis)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Fix `odd` not working for negative numbers

Fixes https://github.com/twigphp/Twig/issues/3424

Commits
-------

53a3ccd2 Fix `odd` not working for negative numbers
2020-11-05 11:55:51 +01:00
Harry Bournis 53a3ccd2d2 Fix odd not working for negative numbers 2020-11-05 11:55:45 +01:00
Fabien Potencier cb4cd888ca Bump version to 1.44.2-DEV 2020-10-27 20:23:26 +01:00
Fabien Potencier 04b15d4c0b Prepare the 1.44.1 release v1.44.1 2020-10-27 20:22:48 +01:00
Fabien Potencier 9fb2deee6e bug #3413 Fix "include(template_from_string())" when not using a sandbox (fabpot)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Fix "include(template_from_string())" when not using a sandbox

Closed #3411

Commits
-------

df9c9f21 Fix "include(template_from_string())"
3d91e335 Fix PHPUnit config
2020-10-27 15:14:35 +01:00
Fabien Potencier 3078be718c Fix CS 2020-10-27 13:53:45 +01:00
Fabien Potencier df9c9f2165 Fix "include(template_from_string())" 2020-10-27 13:39:31 +01:00
Fabien Potencier 3d91e33522 Fix PHPUnit config 2020-10-27 13:37:42 +01:00
Fabien Potencier 18f9309f35 Bump version to 1.44.1-DEV 2020-10-21 14:33:23 +02:00
Fabien Potencier e7c93a4af5 Prepare the 1.44.0 release v1.44.0 2020-10-21 14:32:35 +02:00
Fabien Potencier b1c9faa33e Fix PHP 8 support 2020-10-21 14:08:16 +02:00
Fabien Potencier d46aeb0724 Fix PHP 8 support 2020-10-21 13:43:26 +02:00
Fabien Potencier 4058579e9b feature #3410 Drop support for PHP 7.1 (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Drop support for PHP 7.1

Commits
-------

83d8e431 Drop support for PHP 7.1
2020-10-21 12:23:09 +02:00
Fabien Potencier 83d8e43136 Drop support for PHP 7.1 2020-10-21 12:11:02 +02:00
Fabien Potencier 4fa38c37f7 Update CHANGELOG 2020-10-21 11:56:12 +02:00
Fabien Potencier 545f399f47 minor #3406 [Documentation] Emphase the fact that the include tag outputs data (nstCactus)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead.

Discussion
----------

[Documentation] Emphase the fact that the include tag outputs data

Commits
-------

ef6debec Emphase the fact that the include tag outputs data
2020-10-07 10:01:49 +02:00
nstCactus ef6debec55 Emphase the fact that the include tag outputs data 2020-10-07 10:01:43 +02:00
Fabien Potencier 437c86db9b Update ChANGELOG 2020-09-27 07:04:55 +02:00
Fabien Potencier b67eb715f2 bug #3401 Fix missing delimiter for preg_quote in lexer (waitxd)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Fix missing delimiter for preg_quote in lexer

Is is a really edge case (PHP < 7.3 and '#' as whitespace_trim symbol), but for the sake of consistency here's a proper fix.

Commits
-------

41605057 Fix missing delimiter for preg_quote in lexer
2020-09-27 06:58:47 +02:00
wait 41605057a4 Fix missing delimiter for preg_quote in lexer 2020-09-27 06:58:41 +02:00
Fabien Potencier 67eea1843b Backport #3397 2020-09-14 15:17:28 +02:00
Fabien Potencier b22771177c minor #3393 [Doc][Minor]Update block.rst (l-vo)
This PR was merged into the 1.x branch.

Discussion
----------

[Doc][Minor]Update block.rst

Commits
-------

6b9bc9a0 Update block.rst
2020-09-03 17:23:09 +02:00
Laurent VOULLEMIER 6b9bc9a049 Update block.rst 2020-09-03 16:49:52 +02:00
Fabien Potencier 11e429d23d bug #3349 Add test to verify that filter is not working when template_from_string (Bozhidar Hristov, fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add test to verify that filter is not working when template_from_string

When using {{ include(sandboxed = true) }} in  conjunction with {{ template_from_string() }} - sandbox is not active.

Commits
-------

c7be1bb3 Fix sandbox support when using include(template_from_string())
04431228 Add test to verify that filter is not working when template_from_string is used.
2020-08-23 17:53:39 +02:00
Fabien Potencier c7be1bb3c4 Fix sandbox support when using include(template_from_string()) 2020-08-23 17:48:34 +02:00
Bozhidar Hristov 04431228af Add test to verify that filter is not working when template_from_string is used. 2020-08-23 17:46:12 +02:00
Fabien Potencier 54eff0d96e bug #3341 In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError (thijzert)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError

If a template accidentally performs `|filter(...)` on a variable that isn't traversable (e.g. `null`), the calling code will encouter the raw `TypeError` that results from Twig trying to construct an `IteratorIterator` on that variable. This means that context information (e.g., in which exact template the error occurred, and on which line) is discarded, which makes it very difficult to debug your templates.

This commit adds code to throw a `RuntimeError` if Twig encounters a situation where there's no valid way to filter an array.

Commits
-------

567b1e2a In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
2020-08-23 16:40:19 +02:00
Thijs van Dijk 567b1e2a06 In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError 2020-08-23 16:40:13 +02:00
Fabien Potencier 80a4a1f31e Remove tests that do not make sense 2020-08-23 14:46:38 +02:00
Fabien Potencier df5d4c3aad Update CHANGELOG 2020-08-23 14:20:00 +02:00
Fabien Potencier d14dab78ce Fix previous merge 2020-08-23 14:19:17 +02:00
Fabien Potencier 7fb5d8ee34 feature #3255 Make round brackets optional for one argument tests like sameas (iquito)
This PR was submitted for the 3.x branch but it was squashed and merged into the 1.x branch instead.

Discussion
----------

Make round brackets optional for one argument tests like sameas

Currently Twig forces round brackets when doing tests with `is` if there is an argument:

    {{ 1 is same as(1) ? 'OK' }}
    {{ 8 is divisible by(2) ? 'OK' }}

That syntax always bumped me, because without the brackets it would be easier to understand and write, especially for people who do not know Twig internals:

    {{ 1 is same as 1 ? 'OK' }}
    {{ 8 is divisible by 2 ? 'OK' }}

Twig only has the `same as` and `divisible by` tests which need arguments (in the base library), and for both you usually only need one argument, so it could make the template syntax more concise. [Jinja already supports this syntax](https://jinja.palletsprojects.com/en/2.11.x/templates/#tests) for one argument tests, so it would be one less difference between Jinja and Twig for people who use both.

The changes in this pull request should be fully backwards-compatible - instead of Twig throwing a SyntaxError it now accepts one argument when the round brackets are missing. I added an option for TwigTest to signal that there is one mandatory argument for the test, otherwise the ExpressionParser does not know it should look for that mandatory argument, and this feature is therefore available to anybody writing their own TwigTests, which could help extensions to Twig to simplify their syntax too.

I also adjusted the unit tests for `sameas` and `divisibleby` in hopefully a sensible way.

Commits
-------

1ee72d9e Make round brackets optional for one argument tests like sameas
2020-08-23 14:16:43 +02:00
Andreas 1ee72d9e15 Make round brackets optional for one argument tests like sameas 2020-08-23 14:16:31 +02:00
Fabien Potencier c6927de9e7 Bump version 2020-08-23 13:59:06 +02:00
Fabien Potencier 244ef52df6 Tweak docs 2020-08-23 13:58:27 +02:00
Fabien Potencier b0ce4f64ba Update CHANGELOG 2020-08-23 13:56:44 +02:00
Fabien Potencier 6fe2924795 feature #3277 Support object initialisation shortcut {a} == {a:a} from ES2015 (GromNaN)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Support object initialisation shortcut {a} == {a:a} from ES2015

Object declaration in Twig is very close to the Javascript syntax and is targeting the same profil of developers. In order to provide a smooth developer experience, Twig should implement some new feature of ECMAScript.

Since ECMAScript 2015, a short syntax can be used to declare an object when the key is identical to a defined variable (see [MDN doc](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Operators/Object_initializer))

```js
// Shorthand property names (ES2015)
let a = 'foo', b = 42, c = {};
let o = {a, b, c}
```

This PR adds the same syntax to Twig.
This can be very useful for `include ... with ... only` :
```twig
{% set title = "My title" %}
{% set image = "image.jpg" %}
{{ include "template.twig" with {title, image} only }}
# instead of
{{ include "template.twig" with {title: title, image: image} only }}
```

Commits
-------

133edb36 Support object init from variable
2020-08-23 13:55:00 +02:00
Jérôme TAMARELLE 133edb3696 Support object init from variable
{a} is a shortcut for {a:a}
From ECMAScript 2015 syntax https://developer.mozilla.org/docs/Web/JavaScript/Reference/Operators/Object_initializer
2020-08-23 13:54:49 +02:00
Fabien Potencier bde54e11b8 Fix CS 2020-08-23 13:48:32 +02:00
Fabien Potencier 2c7cad3416 minor #3390 More PHPUnit fixes (fabpot)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

More PHPUnit fixes

Commits
-------

f787c032 Migrate more tests
ad8d012e Update phpunit config
2020-08-23 13:43:11 +02:00
Fabien Potencier f787c032ab Migrate more tests 2020-08-23 12:47:51 +02:00
Fabien Potencier ad8d012e20 Update phpunit config 2020-08-23 12:46:19 +02:00
Fabien Potencier a293147027 minor #3389 Update phpunit assertion (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Update phpunit assertion

Commits
-------

e5882d9f Update phpunit assertion
2020-08-23 12:30:49 +02:00
Fabien Potencier e5882d9fb4 Update phpunit assertion 2020-08-23 12:22:59 +02:00
Fabien Potencier 4ba9822987 Bump version to 1.43.2-DEV 2020-08-05 17:06:12 +02:00
Fabien Potencier 2311602f6a Prepare the 1.43.1 release v1.43.1 2020-08-05 17:05:05 +02:00