Commit Graph

68 Commits

Author SHA1 Message Date
Alexander M. Turek f2053bbea0 PHPUnit 11 2024-09-04 12:11:51 +02:00
Christophe Coevoet 1d71e28a0a Disable the drupal integration tests in the 4.x branch
Drupal uses the AbstractNodeVisitor which is deprecated in 3.x and removed in 4.x, so the job fails all the time.
This should be re-enabled once Drupal can be tested against Twig 4.x.
2024-08-13 16:39:04 +02:00
Fabien Potencier 9acc085110 Merge branch '3.x' into 4.x
* 3.x:
  fix condition for running use_yield test with extra packages
  fix the set of installed packages for TwigExtraBundle on PHP 8.0
  simplify an iterable check
  Fixed typo
  Tweak code, tests, and docs for shuffle
  Add shuffle filter
2024-07-06 10:46:01 +02:00
Fabien Potencier edf489831b minor #4121 fix the set of installed packages for TwigExtraBundle on PHP 8.0 (xabbuh)
This PR was merged into the 3.x branch.

Discussion
----------

fix the set of installed packages for TwigExtraBundle on PHP 8.0

Prevents symfony/translation-contracts 3 to be installed together with symfony/string 5.4.0-RC1 (see https://github.com/twigphp/Twig/actions/runs/9804849131/job/27073398023#step:8:117). Stable releases of the String component don't suffer from this incompatibility because of symfony/symfony#44246.

Commits
-------

c79c7e7a fix the set of installed packages for TwigExtraBundle on PHP 8.0
2024-07-06 10:45:09 +02:00
Christian Flothmann 07967dea80 fix condition for running use_yield test with extra packages 2024-07-05 23:56:22 +02:00
Christian Flothmann c79c7e7a09 fix the set of installed packages for TwigExtraBundle on PHP 8.0 2024-07-05 23:50:30 +02:00
Fabien Potencier b80f74af9a Merge branch '3.x' into 4.x
* 3.x:
  Bump version
  Prepare the 3.10.0 release
  Update CHANGELOG
  Fix markup
  Revert "minor #4042 Auto-close PRs on subtree-splits (kbond)"
  Fix typo
2024-05-11 09:45:46 +02:00
Fabien Potencier 761aa56a6f Revert "minor #4042 Auto-close PRs on subtree-splits (kbond)"
This reverts commit 12625c0c05, reversing
changes made to ad934312cd.
2024-05-11 09:35:57 +02:00
Fabien Potencier 9a11ee1c64 Merge branch '3.x' into 4.x
* 3.x:
  Bump version to 3.9.4-DEV
  Fix a warning
  Use ::class everywhere
  Auto-close PRs on subtree-splits
  Bump version
  Prepare the 3.9.3 release
  Update CHANGELOG
  Ensure Lexer:: is always initialized
  fix: #4033 add missing unwrap call when a TemplateWrapper instance can be present
  change extended DI extension class
  fix: #4029 when use_yield is true CaptureNode use iterator_to_array preserveKeys argument to false
2024-04-24 08:25:00 +02:00
Kevin Bond b212f1bb2f Auto-close PRs on subtree-splits 2024-04-19 08:34:22 +02:00
Fabien Potencier 686d42cb24 Merge branch '3.x' into 4.x
* 3.x:
  Fix compat with PHP 8.4
  Add PHP 8.4 to CI
  Remove usage of array() in fixtures
2024-04-16 11:48:05 -04:00
Fabien Potencier 11511e181d Add PHP 8.4 to CI 2024-04-14 12:38:37 +02:00
Nicolas Grekas 1af9ad0c3e Merge branch '3.x' into 4.x
* 3.x:
  Add `#[YieldReady]` to allow extensions to tell when they're ready for yielding
2024-02-15 11:47:41 +01:00
Nicolas Grekas e70777405d Add #[YieldReady] to allow extensions to tell when they're ready for yielding 2024-02-15 10:27:26 +01:00
Fabien Potencier 497664770c Remove use_yield flag in CI 2024-02-05 16:14:09 +01:00
Fabien Potencier b1c22a1cee Merge branch '3.x' into 4.x
* 3.x:
  Fix tests config
  Fix tests config
2024-02-05 16:12:20 +01:00
Fabien Potencier 84bb846172 Fix tests config 2024-02-05 16:10:51 +01:00
Fabien Potencier d3b5922620 Fix tests config 2024-02-05 16:08:29 +01:00
Fabien Potencier e79c7a3984 Merge branch '3.x' into 4.x
* 3.x:
  Fix bug
  Tweak code
  Add a deprecation when a Node uses echo/print
  Fix tests
  Optimize code
  Add support for templates that do not have output Nodes
  -
  Remove some tests
  -
  Tweak code
  Remove the new yield nodes
  Remove usage of ob_* functions in favor of yielding
  Tweak CI output
2024-02-05 14:27:33 +01:00
Fabien Potencier 71e90fab7b Remove some tests 2024-01-25 13:09:58 +01:00
Fabien Potencier 4fd62abb87 - 2024-01-25 13:09:58 +01:00
Fabien Potencier 3b6cbf98d8 Remove usage of ob_* functions in favor of yielding 2024-01-25 13:09:52 +01:00
Fabien Potencier 594c548b92 Tweak CI output 2024-01-25 09:27:19 +01:00
Fabien Potencier 4cb7a2464f Tweak CI output 2024-01-25 09:27:05 +01:00
Fabien Potencier d234a60efa Merge branch '3.x' into 4.x
* 3.x:
  Bump actions/cache for CI
  Remove an obsolete comment
  Throws proper Twig exception when using cycle on an empty array
  Add tests when a template doesn't have output nodes
  Optimize TextNodes
  Remove list() usage in code
  Remove usage of list() in favor of []
2024-01-22 18:50:54 +01:00
Fabien Potencier 284a510651 Bump actions/cache for CI 2024-01-22 18:49:50 +01:00
Fabien Potencier 5dc2ba921f Remove tests on non-supported PHP versions 2023-12-09 13:46:26 +01:00
Fabien Potencier a04cc88ad7 Add PHP 8.3 to the CI 2023-11-21 16:47:02 +01:00
Fabien Potencier 680e74e649 minor #3877 allow Symfony 7 packages to be installed (xabbuh)
This PR was merged into the 3.x branch.

Discussion
----------

allow Symfony 7 packages to be installed

Commits
-------

b8b0c396 allow Symfony 7 packages to be installed
2023-09-11 15:24:56 +02:00
Christian Flothmann b8b0c39663 allow Symfony 7 packages to be installed 2023-09-11 13:25:50 +02:00
Fabien Potencier 8ca93d8563 Merge branch '2.x' into 3.x
* 2.x:
  Bump CI actions
2023-09-11 13:19:19 +02:00
Fabien Potencier 4d800d7632 Bump CI actions 2023-09-11 13:19:11 +02:00
Fabien Potencier 4c4f73ca70 Bump PHP version used by Drupal tests 2023-07-28 11:59:50 +02:00
Fabien Potencier 04c8163e01 Merge branch '2.x' into 3.x
* 2.x:
  Bump version of actions/cache
2022-12-26 17:29:12 +01:00
Fabien Potencier 6cd1473d65 Bump version of actions/cache 2022-12-26 17:29:08 +01:00
Fabien Potencier 589655c1b9 Re-enable Drupal integration tests 2022-12-26 13:27:08 +01:00
Fabien Potencier 201baa76a6 Merge branch '2.x' into 3.x
* 2.x:
  Do more Github actions updates
  Use checkout actions v3
  Add PHP 8.2 to the tests
  Remove a test that was a regression test for the C extension
2022-12-26 13:19:29 +01:00
Fabien Potencier dec30692ab Do more Github actions updates 2022-12-26 12:47:02 +01:00
Fabien Potencier e428a0b701 Use checkout actions v3 2022-12-26 12:43:42 +01:00
Fabien Potencier 7f9cad9972 Add PHP 8.2 to the tests 2022-12-26 12:43:08 +01:00
Fabien Potencier 40b6f59430 Merge branch '2.x' into 3.x
* 2.x:
  Use the PHP doc builder instead of Sphinx in CI
2022-08-14 15:29:42 +02:00
Fabien Potencier fcf65bd916 Use the PHP doc builder instead of Sphinx in CI 2022-08-14 15:25:29 +02:00
Fabien Potencier 5b5aea4690 Merge branch '2.x' into 3.x
* 2.x:
  chore: Set permissions for GitHub actions
2022-07-04 21:57:33 +02:00
naveen 188fd290c5 chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-07-04 21:55:50 +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 e5a146fd8c This reverts commit 7389f48a1f. 2022-01-03 11:41:54 +01:00
Fabien Potencier e3eb9fcc42 Merge branch '2.x' into 3.x
* 2.x:
  Update CHANGELOG
  Add compat with PHP 7.1 back
2022-01-03 11:40:21 +01:00
Fabien Potencier 7389f48a1f Add compat with PHP 7.1 back 2022-01-03 11:35:05 +01:00
Fabien Potencier 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