Commit Graph

7336 Commits

Author SHA1 Message Date
Fabien Potencier 2c6ed57cb9 minor #4468 Remove PHP 8.1 polyfill (ruudk)
This PR was merged into the 4.x branch.

Discussion
----------

Remove PHP 8.1 polyfill

Not needed when the Twig 4 requires 8.2.

Commits
-------

077d7a54b6 Remove PHP 8.1 polyfill
2024-11-25 09:21:21 +01:00
Ruud Kamphuis 077d7a54b6 Remove PHP 8.1 polyfill
Not needed when the Twig 4 requires 8.2.
2024-11-22 19:18:22 +01:00
Fabien Potencier 492e27e1b4 Fix merge 2024-11-22 10:07:34 +01:00
Fabien Potencier 6f996fc214 Merge branch '3.x' into 4.x
* 3.x:
  Simplify enum usage in docs
  Forbid adding Nodes to EmptyNode
  Add phpstan analysis
  Fix the intl-extra tests
  Fix the string-extra tests when running with older symfony/string
  Fix the exception message to match the expected one for not ready nodes
  Add missing import
  Add BC break note in CHANGELOG for 3.15
  Fix CHANGELOG
  Update CHANGELOG
  Bump version
  Prepare the 3.15.0 release
2024-11-22 10:06:29 +01:00
Fabien Potencier c8494b8ff9 feature #4465 Forbid adding Nodes to EmptyNode (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Forbid adding Nodes to EmptyNode

Commits
-------

ff55f590e7 Forbid adding Nodes to EmptyNode
2024-11-21 21:19:17 +01:00
Fabien Potencier 2dfc9f3751 minor #4455 Simplify enum usage in docs (ruudk)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Simplify enum usage in docs

There is no need to use `()`.

Commits
-------

7556fe1c6f Simplify enum usage in docs
2024-11-21 09:11:13 +01:00
Ruud Kamphuis 7556fe1c6f Simplify enum usage in docs 2024-11-21 09:11:11 +01:00
Fabien Potencier ff55f590e7 Forbid adding Nodes to EmptyNode 2024-11-21 08:47:22 +01:00
Fabien Potencier 679e41394a feature #4458 Add phpstan analysis (VincentLanglet)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Add phpstan analysis

As suggested by `@ruudk` here: https://github.com/twigphp/Twig/pull/4456#issuecomment-2488087625
I think it could be useful to add phpstan analysis on twig.

This is an example of all the things reported when checking level 3 PHPStan (more will get more errors to fix).

Commits
-------

75d48db822 Add phpstan analysis
2024-11-20 20:05:36 +01:00
Vincent Langlet 75d48db822 Add phpstan analysis 2024-11-20 20:05:33 +01:00
Fabien Potencier 8c91bd7093 minor #4461 Fix the intl-extra tests (stof)
This PR was merged into the 3.x branch.

Discussion
----------

Fix the intl-extra tests

symfony/intl has updated its data from ICU 75.1 to ICU 76.1, which includes new currency and scripts.

Commits
-------

d69c66643f Fix the intl-extra tests
2024-11-20 17:23:39 +01:00
Fabien Potencier 21c40ea2fb minor #4460 Fix the string-extra tests when running with older symfony/string (stof)
This PR was merged into the 3.x branch.

Discussion
----------

Fix the string-extra tests when running with older symfony/string

My review comment in https://github.com/twigphp/Twig/pull/4426#discussion_r1822452803 was not taken into account to handle the case of using a version of `symfony/string` without the SpanishInflector, and the PR was merged with broken tests.

Commits
-------

abc34bd263 Fix the string-extra tests when running with older symfony/string
2024-11-20 17:23:12 +01:00
Fabien Potencier 4d3ee19d22 bug #4459 Fix the exception message to match the expected one for not ready nodes (stof)
This PR was merged into the 3.x branch.

Discussion
----------

Fix the exception message to match the expected one for not ready nodes

This fixes the tests that got broken in https://github.com/twigphp/Twig/pull/4446 because that PR updated the expected message to include the FQCN of the attribute for both the deprecation and the exception, but forgot to use the FQCN in the actual exception.

Commits
-------

b15ba0f963 Fix the exception message to match the expected one for not ready nodes
2024-11-20 17:22:27 +01:00
Christophe Coevoet d69c66643f Fix the intl-extra tests
symfony/intl has updated its data from ICU 75.1 to ICU 76.1, which
includes new currency and scripts.
2024-11-20 14:19:52 +01:00
Christophe Coevoet abc34bd263 Fix the string-extra tests when running with older symfony/string 2024-11-20 14:10:15 +01:00
Christophe Coevoet b15ba0f963 Fix the exception message to match the expected one for not ready nodes 2024-11-20 13:36:08 +01:00
Fabien Potencier fd4d580654 minor #4456 Add missing import (VincentLanglet)
This PR was merged into the 3.x branch.

Discussion
----------

Add missing import

Hi `@fabpot`, the phpdoc was updated in https://github.com/twigphp/Twig/pull/4367 but the import was forgotten.
This leads to an error with all static analysis tools when implementing ExtensionInterface.

If possible a patch version would be helpful.

(Tests are already failing on 3.x)

Commits
-------

51d10ba480 Add missing import
2024-11-20 10:37:29 +01:00
Vincent Langlet 51d10ba480 Add missing import 2024-11-20 10:18:47 +01:00
Fabien Potencier 709fc6abce minor #4454 Add BC break note in CHANGELOG for 3.15 (nicolas-grekas)
This PR was merged into the 3.x branch.

Discussion
----------

Add BC break note in CHANGELOG for 3.15

Let's add this hint for people affected by the behavior change, as in https://github.com/twigphp/Twig/issues/4453

Commits
-------

37d99c2a59 Add BC break note in CHANGELOG for 3.15
2024-11-19 15:11:18 +01:00
Nicolas Grekas 37d99c2a59 Add BC break note in CHANGELOG for 3.15 2024-11-19 14:24:04 +01:00
Fabien Potencier 3a438ffb9b Fix CHANGELOG 2024-11-18 09:23:06 +01:00
Fabien Potencier f544879b31 minor #4451 Update CHANGELOG (andreybolonin)
This PR was merged into the 3.x branch.

Discussion
----------

Update CHANGELOG

Commits
-------

fee03389c8 Update CHANGELOG
2024-11-18 09:22:14 +01:00
Andrey Bolonin fee03389c8 Update CHANGELOG 2024-11-18 10:56:02 +03:00
Fabien Potencier 8f3f8df9cd Bump version 2024-11-17 17:00:39 +01:00
Fabien Potencier 2d5b3964cc Prepare the 3.15.0 release v3.15.0 2024-11-17 16:59:19 +01:00
Fabien Potencier 46e2226b4e Merge branch '3.x' into 4.x
* 3.x:
  Simplify code
  Fix CHANGELOG
  Improve YieldReady support docs
  Fix some typos in `html_cva` docs
  Fix wrong type for cycle position
  Add type for join method
2024-11-17 16:48:59 +01:00
Fabien Potencier 41a7988cef Simplify code 2024-11-17 16:45:52 +01:00
Fabien Potencier 065a45f54a Fix CHANGELOG 2024-11-17 16:31:33 +01:00
Fabien Potencier c5d0d593d2 minor #4446 Improve YieldReady support docs (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Improve YieldReady support docs

Refs https://github.com/twigphp/Twig/discussions/4428

Commits
-------

9d9c9d81e9 Improve YieldReady support docs
2024-11-12 08:12:30 +01:00
Fabien Potencier 9d9c9d81e9 Improve YieldReady support docs 2024-11-11 09:38:36 +01:00
Fabien Potencier 0ca3815c5c minor #4444 Fix some typos in html_cva docs (jdreesen)
This PR was merged into the 3.x branch.

Discussion
----------

Fix some typos in `html_cva` docs

Commits
-------

151b05b2bb Fix some typos in `html_cva` docs
2024-11-08 20:13:25 +01:00
Jacob Dreesen 151b05b2bb Fix some typos in html_cva docs 2024-11-08 19:22:16 +01:00
Fabien Potencier 5b380e5b3b minor #4435 Fix wrong type for cycle position (ruudk)
This PR was merged into the 3.x branch.

Discussion
----------

Fix wrong type for cycle position

It also accepts 0, which is not a positive int.

Commits
-------

c78499bda9 Fix wrong type for cycle position
2024-11-07 18:02:41 +01:00
Fabien Potencier 8f1ae67b73 minor #4421 Add type for join method (ruudk)
This PR was merged into the 3.x branch.

Discussion
----------

Add type for join method

Looking at the code, this method is very forgiving in what it accepts.

This helps PHPStan to not complain when something other than an array is passed.

Did I miss other types?

/cc `@stof`

Commits
-------

226f0ff0dd Add type for join method
2024-11-07 18:02:05 +01:00
Fabien Potencier b3e2b294c9 Simplify code 2024-11-07 13:44:34 +01:00
Fabien Potencier 22eefc2a76 Merge branch '3.x' into 4.x
* 3.x:
  Rely on reflection to access null properties
2024-11-07 13:40:55 +01:00
Fabien Potencier 0232d389ca minor #4425 Rely on reflection to access null properties (nicolas-grekas)
This PR was merged into the 3.x branch.

Discussion
----------

Rely on reflection to access null properties

Benchmark like https://gist.github.com/arnaud-lb/c4235164fb41e11672aa670da8fa4fc7 (which were done for another use case but is still relevant here) prove that using reflection instead of array-casts is significantly faster for accessing properties.

Checking for dynamic properties is done with property_exists.

Commits
-------

5cd1ff1977 Rely on reflection to access null properties
2024-11-07 13:39:46 +01:00
Fabien Potencier ee6b4ebb6d Merge branch '3.x' into 4.x
* 3.x:
  Prepare the 3.14.2 release
  Prepare the 3.11.3 release
  Update CHANGELOG
2024-11-07 13:37:39 +01:00
Fabien Potencier a362ee312d Merge branch '3.14.x' into 3.x
* 3.14.x:
  Prepare the 3.14.2 release
  Prepare the 3.11.3 release
  Update CHANGELOG
2024-11-07 13:37:21 +01:00
Fabien Potencier 0b6f9d8370 Prepare the 3.14.2 release v3.14.2 2024-11-07 13:36:22 +01:00
Fabien Potencier fe9e0d00c1 Merge branch '3.11.x' into 3.14.x
* 3.11.x:
  Prepare the 3.11.3 release
  Update CHANGELOG
2024-11-07 13:35:53 +01:00
Fabien Potencier 3b06600ff3 Prepare the 3.11.3 release v3.11.3 2024-11-07 13:34:41 +01:00
Fabien Potencier dbd734a553 Update CHANGELOG 2024-11-07 13:34:21 +01:00
Nicolas Grekas 3f7c47fc01 Merge branch '3.x' into 4.x
* 3.x:
  Improve detection of recursion
  Fix recursion when arrays contain self-references in sandboxed mode
  Fix code
  Prepare the 3.11.2 release
  Update CHANGELOG
  Sandbox ArrayAccess and do sandbox checks before isset() checks
  Fix sandbox handling for __toString()
  Prepare the 3.14.1 release
  Update CHANGELOG
  Sandbox ArrayAccess and do sandbox checks before isset() checks
  Fix sandbox handling for __toString()
  Prepare the 3.11.1 release
  Fix a security issue when an included sandboxed template has been loaded before without the sandbox context
2024-11-07 11:43:01 +01:00
Nicolas Grekas 5cd1ff1977 Rely on reflection to access null properties 2024-11-07 11:23:04 +01:00
Nicolas Grekas d72ae2447e Merge branch '3.14.x' into 3.x
* 3.14.x:
  Improve detection of recursion
  Fix recursion when arrays contain self-references in sandboxed mode
  Fix code
  Prepare the 3.11.2 release
  Update CHANGELOG
  Sandbox ArrayAccess and do sandbox checks before isset() checks
  Fix sandbox handling for __toString()
  Prepare the 3.14.1 release
  Update CHANGELOG
  Sandbox ArrayAccess and do sandbox checks before isset() checks
  Fix sandbox handling for __toString()
  Prepare the 3.11.1 release
  Fix a security issue when an included sandboxed template has been loaded before without the sandbox context
2024-11-07 11:17:57 +01:00
Nicolas Grekas 83a21d31e5 Merge branch '3.11.x' into 3.14.x
* 3.11.x:
  Improve detection of recursion
  Fix recursion when arrays contain self-references in sandboxed mode
  Fix code
  Prepare the 3.11.2 release
  Update CHANGELOG
  Sandbox ArrayAccess and do sandbox checks before isset() checks
  Fix sandbox handling for __toString()
  Prepare the 3.11.1 release
  Fix a security issue when an included sandboxed template has been loaded before without the sandbox context
2024-11-07 11:11:36 +01:00
Nicolas Grekas d3fc074171 Improve detection of recursion 2024-11-07 10:15:07 +01:00
Lee Rowlands a0f775683d Fix recursion when arrays contain self-references in sandboxed mode 2024-11-07 09:42:22 +01:00
Fabien Potencier 262b5c8c70 Simplify doc 2024-11-06 21:54:03 +01:00