Commit Graph

5892 Commits

Author SHA1 Message Date
Fabien Potencier 05c8eb54d8 Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.14.13 release
2022-04-06 08:47:08 +02:00
Fabien Potencier f6bd36a694 Bump version 2022-04-06 08:46:17 +02:00
Fabien Potencier 66856cd045 Prepare the 2.14.13 release v2.14.13 2022-04-06 08:45:17 +02:00
Fabien Potencier 9fb8b8dc68 Merge branch '2.x' into 3.x
* 2.x:
  Enable bytecode invalidation with auto_reload
2022-04-05 18:27:22 +02:00
Fabien Potencier 8fa2c9a2b2 bug #3675 Enable cache invalidation when auto_reload=true (GromNaN)
This PR was merged into the 2.x branch.

Discussion
----------

Enable cache invalidation when auto_reload=true

Related to https://github.com/symfony/symfony-docs/pull/16671

Enabling `auto_reload` is not effective when `opcache.validate_timestamps=0`.

Commits
-------

ef8ae9cb Enable bytecode invalidation with auto_reload
2022-04-05 18:27:00 +02:00
Jérôme Tamarelle ef8ae9cb61 Enable bytecode invalidation with auto_reload 2022-04-05 18:17:00 +02:00
Fabien Potencier 393ea10efd Merge branch '2.x' into 3.x
* 2.x:
  Fix docs about the deprecated tag
2022-03-26 12:00:50 +01:00
Fabien Potencier 1dd5c10e73 minor #3672 Fix docs about the deprecated tag (fabpot)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Fix docs about the deprecated tag

Closes #3594

Commits
-------

17142af9 Fix docs about the deprecated tag
2022-03-26 12:00:29 +01:00
Fabien Potencier 17142af9f8 Fix docs about the deprecated tag 2022-03-26 11:37:03 +01:00
Fabien Potencier 9459614141 Bump version 2022-03-25 10:38:42 +01:00
Fabien Potencier 6ff9b0e440 Prepare the 3.3.9 release v3.3.9 2022-03-25 10:37:52 +01:00
Fabien Potencier 662a568e54 Update CHANGELOG 2022-03-25 10:37:32 +01:00
Fabien Potencier 4cbce128e3 Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.14.12 release
  Update CHANGELOG
2022-03-25 10:36:34 +01:00
Fabien Potencier 28bec2f1ff Bump version 2022-03-25 10:35:55 +01:00
Fabien Potencier 19c898bda3 Prepare the 2.14.12 release v2.14.12 2022-03-25 10:34:52 +01:00
Fabien Potencier 2d9da2d904 Update CHANGELOG 2022-03-25 10:34:21 +01:00
Fabien Potencier 760341fa8c feature #3533 add support for the class constant on objects (dunglas)
This PR was merged into the 3.x branch.

Discussion
----------

add support for the class constant on objects

This is especially useful for Symfony Turbo:

Before:

```twig
<div id="books" {{ turbo_stream_listen('App\\Entity\\Book') }}></div>
```

After:

```twig
<div id="books" {{ turbo_stream_listen(constant('class', book) }}></div>
```

Replace https://github.com/php/php-src/pull/6763

Commits
-------

0d6bd458 add support for the class constant on objects
2022-03-25 09:58:54 +01:00
Kévin Dunglas 0d6bd45844 add support for the class constant on objects 2022-03-25 09:58:48 +01:00
Fabien Potencier 59d5260c33 Merge branch '2.x' into 3.x
* 2.x:
  Fix docs
  Tweak docs
  New info: Documents / filters / format_datetime: added info and example of using argument `timezone`
2022-03-25 09:54:32 +01:00
Fabien Potencier df053afb44 Fix docs 2022-03-25 09:53:24 +01:00
Fabien Potencier 3178098337 Tweak docs 2022-03-25 09:48:05 +01:00
Fabien Potencier c17b0af03e minor #3486 New info: Documents / filters / format_datetime: added info and examp… (EarthDweller)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

New info: Documents / filters / format_datetime: added info and examp…

…le of using argument `timezone`

issues 3477:
https://github.com/twigphp/Twig/issues/3477

Commits
-------

16d06cc4 New info: Documents / filters / format_datetime: added info and example of using argument `timezone`
2022-03-25 09:30:38 +01:00
Тимофей Соловейчик 16d06cc422 New info: Documents / filters / format_datetime: added info and example of using argument timezone 2022-03-25 09:30:27 +01:00
Fabien Potencier 3fef888756 Merge branch '2.x' into 3.x
* 2.x:
  Add a test
  Added token type and value to error message
  Add phpdoc to SecurityPolicyInterface
2022-03-25 09:18:59 +01:00
Fabien Potencier beea1a7c4a Add a test 2022-03-25 09:18:53 +01:00
Fabien Potencier d776736787 minor #3644 Added token type and value to error message (kmirzavaziri)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Added token type and value to error message

Added the given token type and value to the error message in case that the token after '.' is neither a name  nor a number.

I think it helps a lot to have more expressive verbose error messages (specially in this case with the dot `.` operator, since it's the concatenation operator in PHP and developers may mistakenly use it instead of tilde `~` operator which is the concatenation operator in Twig.

I also think that it's better to extract the error message generating script out of `TokenStream::expect` (the code I included at the end of this message) and make it a new method with more general flexibility to be able to use the same method with all these scenarios but I'm not sure if this level of abstraction meets the Twig source policy so I didn't try to do that.

```
sprintf('%sUnexpected token "%s"%s ("%s" expected%s).',
                $message ? $message.'. ' : '',
                Token::typeToEnglish($token->getType()),
                $token->getValue() ? sprintf(' of value "%s"', $token->getValue()) : '',
                Token::typeToEnglish($type), $value ? sprintf(' with value "%s"', $value) : '')
```

Commits
-------

6c8da65b Added token type and value to error message
2022-03-25 09:17:49 +01:00
Kamyar Mirzavaziri 6c8da65b74 Added token type and value to error message
Added the given token type and value to the error message in case that the token after '.' is neither a name  nor a number.
2022-03-25 09:17:46 +01:00
Fabien Potencier 65bedae131 minor #3667 Add phpdoc to SecurityPolicyInterface (VincentLanglet)
This PR was merged into the 2.x branch.

Discussion
----------

Add phpdoc to SecurityPolicyInterface

Hi @fabpot, this is a follow up of https://github.com/twigphp/Twig/pull/3664

I think adding phpdoc to this interface wouldn't hurt.
I took a look at https://github.com/twigphp/Twig/blob/2.x/src/Sandbox/SecurityPolicy.php to know the type of the parameters.

Commits
-------

e33f97cd Add phpdoc to SecurityPolicyInterface
2022-03-25 09:11:21 +01:00
Fabien Potencier 5aaf393a11 Remove legacy test 2022-03-25 09:10:15 +01:00
Fabien Potencier d6f9a4e7a2 Merge branch '2.x' into 3.x
* 2.x:
  Fix custom escapers when using multiple Twig environments
  Rename variable
2022-03-25 09:06:57 +01:00
Fabien Potencier 6f7bb4c983 bug #3671 Fix custom escapers when using multiple Twig environments (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Fix custom escapers when using multiple Twig environments

Closes #3668

Commits
-------

9c03ef0d Fix custom escapers when using multiple Twig environments
2022-03-25 09:03:17 +01:00
Fabien Potencier 9c03ef0d21 Fix custom escapers when using multiple Twig environments 2022-03-25 08:56:44 +01:00
Vincent Langlet e33f97cd8b Add phpdoc to SecurityPolicyInterface 2022-03-17 22:53:08 +01:00
Fabien Potencier 4c4fb89512 bug #3664 Rename variable in SecurityPolicyInterface.php (VincentLanglet)
This PR was merged into the 2.x branch.

Discussion
----------

Rename variable in SecurityPolicyInterface.php

Hi @fabpot

When using psalm, an error is reported when the name of the variable is not the same than the one in the interface.
This also could give issues with named params.

The securityPolicy implementation is using `property` as the name of the variable, which make a lot more sens https://github.com/twigphp/Twig/blob/3.x/src/Sandbox/SecurityPolicy.php#L110.

So I updated the interface. But I wasn't sure on which branch (1.x, 2.x, 3.x) I should have opened the PR.

I also wondering if you want me to rename $obj to $object maybe ?

Commits
-------

3f07c38c Rename variable
2022-03-15 09:46:17 +01:00
Vincent Langlet 3f07c38c9a Rename variable 2022-03-15 08:59:44 +01:00
Fabien Potencier e33577f1be Merge branch '2.x' into 3.x
* 2.x:
  do not reuse internally generated variable names during parsing
2022-02-25 09:30:09 +01:00
Fabien Potencier 53c42377f5 bug #3654 do not reuse internally generated variable names during parsing (xabbuh)
This PR was merged into the 2.x branch.

Discussion
----------

do not reuse internally generated variable names during parsing

fixes #3647

Commits
-------

1411c454 do not reuse internally generated variable names during parsing
2022-02-25 09:29:50 +01:00
Christian Flothmann 1411c454c1 do not reuse internally generated variable names during parsing 2022-02-24 17:25:50 +01:00
Fabien Potencier 237f1789a7 Merge branch '2.x' into 3.x
* 2.x:
  Fix CHANGELOG
2022-02-04 08:03:10 +01:00
Fabien Potencier 1e04274f34 Fix CHANGELOG 2022-02-04 08:03:05 +01:00
Fabien Potencier e04a204b6f Bump version 2022-02-04 08:00:58 +01:00
Fabien Potencier 972d8604a9 Prepare the 3.3.8 release v3.3.8 2022-02-04 07:59:48 +01:00
Fabien Potencier b2652331bf Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.14.11 release
2022-02-04 07:59:14 +01:00
Fabien Potencier fca80b536d Bump version 2022-02-04 07:58:43 +01:00
Fabien Potencier 66baa66f29 Prepare the 2.14.11 release v2.14.11 2022-02-04 07:57:25 +01:00
Fabien Potencier 9e5ca747b6 Merge branch '2.x' into 3.x
* 2.x:
  Disallow non closures in `sort` filter when the sanbox mode is enabled
2022-02-04 07:56:23 +01:00
Fabien Potencier 22b9dc3c03 bug #3641 Disallow non closures in sort filter when the sanbox mode is enabled (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Disallow non closures in `sort` filter when the sanbox mode is enabled

Commits
-------

2eb33080 Disallow non closures in `sort` filter when the sanbox mode is enabled
2022-02-04 07:54:44 +01:00
Fabien Potencier 2eb3308055 Disallow non closures in sort filter when the sanbox mode is enabled 2022-02-04 07:52:21 +01:00
Fabien Potencier 25d410b19d Merge branch '2.x' into 3.x
* 2.x:
  Fix call to deprecated "convertToHtml" method
2022-01-29 16:34:05 +01:00
Fabien Potencier e056e6385f bug #3638 Fix call to deprecated "convertToHtml" method (jderusse)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Fix call to deprecated "convertToHtml" method

note: We can not rely on the new interface `ConverterInterface` because this interface already existed in [version 1.0](https://github.com/thephpleague/commonmark/blob/1.0/src/ConverterInterface.php)

Commits
-------

779fdd09 Fix call to deprecated "convertToHtml" method
2022-01-29 16:33:47 +01:00