8f168c6ffa
Prepare the 3.3.7 release
2022-01-03 22:15:37 +01:00
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
3cb664cc31
Bump version
2022-01-03 15:28:11 +01:00
bb07a77620
Prepare the release
2022-01-03 15:27:01 +01:00
e9cd55def5
Allow null for nl2br, striptags and format filters
...
Same as https://github.com/twigphp/Twig/pull/3617
2022-01-03 14:28:28 +01:00
e5145f5022
Bump version
2022-01-03 12:38:04 +01:00
a0f614a192
Prepare the 3.3.5 release
2022-01-03 12:36:47 +01:00
e155d8dcfc
Bump version
2022-01-03 12:00:21 +01:00
d28b8d7390
Prepare the 2.14.9 release
2022-01-03 11:46:18 +01:00
ec23eba2ad
Merge branch '2.x' into 3.x
...
* 2.x:
Add 8.1 in tests
Allow null when Twig expects a string
2022-01-02 17:23:10 +01:00
ec1e739ef9
minor #3541 Implement template annotation for getExtension (mitelg)
...
This PR was merged into the 3.x branch.
Discussion
----------
Implement template annotation for `getExtension`
Hello there 🙂 👋
my first PR here 😉
This change would help to improve static analysis with tools like PHPStan and Psalm.
Commits
-------
110871d1
2022-01-02 16:29:57 +01:00
92bc110bcf
Allow null when Twig expects a string
2022-01-02 16:05:53 +01:00
dd6c50835d
Merge branch '2.x' into 3.x
...
* 2.x:
Remove unneeded coments
Optimize Environment::resolveTemplate() to be much faster when template overrides do not exist
2021-12-17 08:49:53 -08:00
3284859a1b
Remove unneeded coments
2021-12-17 08:44:00 -08:00
4d46ed3ac3
minor #3596 Optimize Environment::resolveTemplate() to be much faster when template overrides do not exist (mahagr)
...
This PR was squashed before being merged into the 2.x branch.
Discussion
----------
Optimize Environment::resolveTemplate() to be much faster when template overrides do not exist
Fixes partially #3595 .
You can test this by adding an object into the context which implements `__debugInfo()` with a counter in it. Make a template with
```twig
{% include ['missing_template1', 'missing_template2', 'missing_template3', 'missing_template4', 'missing_template5'] %}
```
And check how many times an exception was thrown by reading the counter. The issue gets exponentially worse if you have nested templates with overrides in each of them.
Commits
-------
695423e1
2021-12-17 08:43:16 -08:00
695423e14e
Optimize Environment::resolveTemplate() to be much faster when template overrides do not exist
2021-12-17 08:43:05 -08:00
d97690ff37
Merge branch '2.x' into 3.x
...
* 2.x:
Use faster hash algorithm (xxh128) on PHP 8.1
2021-12-16 11:54:25 -08:00
4fcc6b1c47
Use faster hash algorithm (xxh128) on PHP 8.1
2021-12-15 06:29:16 +01:00
63b3ddd11a
Merge branch '2.x' into 3.x
...
* 2.x:
Hashing is not necessary to generate unique variable names during compilation
2021-12-14 15:28:12 -08:00
ba2b4e6dfe
Hashing is not necessary to generate unique variable names during compilation
2021-12-14 15:26:59 -08:00
5785185018
Bump version
2021-11-25 14:49:08 +01:00
65cb6f0b95
Prepare the 3.3.4 release
2021-11-25 14:46:55 +01:00
527c9e05c9
Bump version
2021-11-25 14:44:38 +01:00
06b450a232
Prepare the 2.14.8 release
2021-11-25 14:38:06 +01:00
96d8b0ecd4
Bump version
2021-09-17 10:45:16 +02:00
a27fa056df
Prepare the 3.3.3 release
2021-09-17 10:44:23 +02:00
78ac30114f
Bump version
2021-09-17 10:41:05 +02:00
8e202327ee
Prepare the 2.14.7 release
2021-09-17 10:39:54 +02:00
464842c41f
Merge branch '2.x' into 3.x
...
* 2.x:
Add explicit `@return` type next to `#[ReturnTypeWillChange]`
2021-08-11 09:52:24 +02:00
1d0bab9d63
Add explicit @return type next to #[ReturnTypeWillChange]
2021-08-10 18:49:26 +02:00
d9ac797190
Merge branch '2.x' into 3.x
...
* 2.x:
Twig2 PHP 8.1 beta compatibility
2021-07-29 09:09:30 +02:00
98c2233e47
Twig2 PHP 8.1 beta compatibility
2021-07-28 09:49:43 +01:00
5f20d4a362
Merge branch '2.x' into 3.x
...
* 2.x:
Explicitly specify the encoding for mb_ord in JS escaper
2021-07-08 13:01:29 +02:00
feeaba3fea
Merge branch '1.x' into 2.x
...
* 1.x:
Explicitly specify the encoding for mb_ord in JS escaper
2021-07-08 13:01:04 +02:00
da24c9340e
Explicitly specify the encoding for mb_ord in JS escaper
...
Explicitly specify the encoding for mb_ord in JS escaper - fix
2021-07-08 12:58:33 +02:00
110871d1de
Implement template annotation for getExtension and getRuntime
...
Improves static analysis for caller of this methods
2021-06-29 14:54:27 +02:00
ed29f0010f
Merge branch '2.x' into 3.x
...
* 2.x:
Add ReturnTypeWillChange to JsonSerializable implementation
Fix implicit flot to int casts
2021-06-06 18:31:44 +02:00
7926399e0a
Merge branch '1.x' into 2.x
...
* 1.x:
Fix implicit flot to int casts
2021-06-06 18:31:25 +02:00
507f78d9c4
Add ReturnTypeWillChange to JsonSerializable implementation
...
Signed-off-by: Alexander M. Turek <me@derrabus.de >
2021-06-06 00:40:16 +02:00
de9cd76d7c
Fix implicit flot to int casts
2021-06-06 00:32:22 +02:00
4659a99cdf
Merge branch '2.x' into 3.x
...
* 2.x:
Fix URLs
Replace secure.php.net with www.php.net
2021-05-19 09:38:07 +02:00
c2fc988fd7
Fix URLs
2021-05-19 09:15:15 +02:00
1783298bb8
Replace secure.php.net with www.php.net
...
See: https://news-web.php.net/php.internals/104533
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev >
2021-05-18 16:07:51 -03:00
00a988fb04
Bump version
2021-05-16 14:14:57 +02:00
21578f00e8
Prepare the 3.3.2 release
2021-05-16 14:14:13 +02:00
80de1a14c0
Bump version
2021-05-16 14:13:42 +02:00
27e5cf2b05
Prepare the 2.14.6 release
2021-05-16 14:12:47 +02:00
577c5423d6
Bump version
2021-05-16 14:11:59 +02:00
4d40042152
Prepare the 1.44.4 release
2021-05-16 14:11:20 +02:00
ad86c88359
Merge branch '2.x' into 3.x
...
* 2.x:
Update CHANGELOG
Update CHANGELOG
Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
2021-05-16 14:07:50 +02:00
Fabien Potencier
Ruud Kamphuis
Matias Griese
Jérôme TAMARELLE
Nicolas Grekas
Alex Pott
Oleg Stepanischev
Michael Telgmann
Alexander M. Turek
Maurício Meneghini Fauth