Fabien Potencier
e07cdd3d43
Prepare the 3.4.2 release
2022-08-12 08:47:24 +02:00
Fabien Potencier
bcda6c3323
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Allow inherited magic method to still run with calling class
2022-08-12 08:33:18 +02:00
Ben Thomson
d1457a40b6
Allow inherited magic method to still run with calling class
...
If a static method cannot be resolved to the calling class, but the calling class has, or inherits, a `__callStatic` handler, this allows the `__callStatic` handler to be used with the calling class, and not the inherited class as would occur with reflection. This allows systems such as Laravel facades to still work.
Fixes https://github.com/twigphp/Twig/issues/3716
2022-07-06 10:46:46 +02:00
Fabien Potencier
45a8317e61
Merge branch '2.x' into 3.x
...
* 2.x:
Fixes `CallExpression::reflectCallable()` throwing `TypeError`
2022-06-02 20:35:24 +02:00
ju1ius
e333ccc9f6
Fixes CallExpression::reflectCallable() throwing TypeError
2022-06-02 20:33:33 +02:00
Fabien Potencier
a1f8d3f91a
Bump version
2022-05-17 07:49:32 +02:00
Fabien Potencier
e939eae923
Prepare the 3.4.1 release
2022-05-17 07:48:52 +02:00
Fabien Potencier
fcc900cf80
Bump version
2022-05-17 07:47:36 +02:00
Fabien Potencier
3b7cedb2f7
Prepare the 2.15.1 release
2022-05-17 07:46:24 +02:00
Fabien Potencier
d90435f6be
Merge branch '2.x' into 3.x
...
* 2.x:
Fix optimizing non-public named closures
Bump version
Prepare the 2.15.0 release
2022-05-17 07:45:01 +02:00
Nicolas Grekas
dd34e9f5c9
Fix optimizing non-public named closures
2022-05-16 17:47:23 +02:00
Fabien Potencier
9612dd4f13
Bump version
2022-05-15 08:26:19 +02:00
Fabien Potencier
ed19f4bf9d
Prepare the 3.4.0 release
2022-05-15 08:25:28 +02:00
Fabien Potencier
137b370376
Bump version
2022-05-15 08:24:02 +02:00
Fabien Potencier
2fcc95728f
Prepare the 2.15.0 release
2022-05-15 08:21:48 +02:00
Fabien Potencier
9ca7fb8799
Merge branch '2.x' into 3.x
...
* 2.x:
Fix support for named closures
2022-05-15 08:11:13 +02:00
Nicolas Grekas
163f07400a
Fix support for named closures
2022-05-13 17:01:54 +02:00
Fabien Potencier
321c5cbf20
Bump version
2022-04-06 08:48:37 +02:00
Fabien Potencier
8442df056c
Prepare the 2.14.13 release
2022-04-06 08:47:41 +02:00
Fabien Potencier
f6bd36a694
Bump version
2022-04-06 08:46:17 +02:00
Fabien Potencier
66856cd045
Prepare the 2.14.13 release
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
Jérôme Tamarelle
ef8ae9cb61
Enable bytecode invalidation with auto_reload
2022-04-05 18:17:00 +02:00
Fabien Potencier
9459614141
Bump version
2022-03-25 10:38:42 +01:00
Fabien Potencier
6ff9b0e440
Prepare the 3.3.9 release
2022-03-25 10:37:52 +01:00
Fabien Potencier
28bec2f1ff
Bump version
2022-03-25 10:35:55 +01:00
Fabien Potencier
19c898bda3
Prepare the 2.14.12 release
2022-03-25 10:34:52 +01:00
Kévin Dunglas
0d6bd45844
add support for the class constant on objects
2022-03-25 09:58:48 +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
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
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
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
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
Christian Flothmann
1411c454c1
do not reuse internally generated variable names during parsing
2022-02-24 17:25:50 +01:00
Fabien Potencier
e04a204b6f
Bump version
2022-02-04 08:00:58 +01:00
Fabien Potencier
972d8604a9
Prepare the 3.3.8 release
2022-02-04 07:59:48 +01:00
Fabien Potencier
fca80b536d
Bump version
2022-02-04 07:58:43 +01:00
Fabien Potencier
66baa66f29
Prepare the 2.14.11 release
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
2eb3308055
Disallow non closures in sort filter when the sanbox mode is enabled
2022-02-04 07:52:21 +01:00
Fabien Potencier
5981815757
Merge branch '2.x' into 3.x
...
* 2.x:
Rename variables used in map method
The deprecated null value for the method round has been changed to zero.
2022-01-14 12:47:50 +01:00
v.arsentev
7d0e5d6a1e
The deprecated null value for the method round has been changed to zero.
2022-01-11 16:12:44 +01:00
Fabien Potencier
09c7f7dd9c
Bump version
2022-01-03 22:16:33 +01:00
Fabien Potencier
8f168c6ffa
Prepare the 3.3.7 release
2022-01-03 22:15:37 +01:00
Fabien Potencier
4c225d504f
Bump version
2022-01-03 22:14:18 +01:00
Fabien Potencier
95fb194cd4
Prepare the 2.14.10 release
2022-01-03 22:13:26 +01:00
Fabien Potencier
1231fd4096
Merge branch '2.x' into 3.x
...
* 2.x:
Allow null for nl2br, striptags and format filters
2022-01-03 17:03:55 +01:00