Commit Graph

214 Commits

Author SHA1 Message Date
Fabien Potencier df07638b63 Merge branch '3.x' into 4.x
* 3.x:
  Use stable versions of tools
2026-02-07 09:13:11 +01:00
Fabien Potencier 44093544e6 Use stable versions of tools 2026-02-07 09:12:49 +01:00
Fabien Potencier 0facb551b0 Merge branch '3.x' into 4.x
* 3.x:
  Fix CS
2026-02-07 09:12:05 +01:00
Fabien Potencier 861215c507 Fix CS 2026-02-07 09:07:38 +01:00
Fabien Potencier dc6356268b Bump min PHP version to 8.1 2025-01-31 21:45:36 +01:00
Christian Flothmann 351129cffa add back minimum stability
enforce stable releases of dev tools instead
2024-12-01 12:33:25 +01:00
Fabien Potencier 196c9dcf85 minor #4472 [Twig 4] Add PHPUnit as dev dependency (ruudk)
This PR was squashed before being merged into the 4.x branch.

Discussion
----------

[Twig 4] Add PHPUnit as dev dependency

This makes it easier to run the tests locally.

I understand we didn't do this previously (Twig 3) because of `symfony/simple-phpunit`. But that is now removed in Twig 4, so maybe we can do this as well?

Commits
-------

c352a8d283 [Twig 4] Add PHPUnit as dev dependency
2024-12-01 10:29:11 +01:00
Ruud Kamphuis c352a8d283 [Twig 4] Add PHPUnit as dev dependency 2024-12-01 10:29:08 +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 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
Vincent Langlet 75d48db822 Add phpstan analysis 2024-11-20 20:05:33 +01:00
Alexander M. Turek f2053bbea0 PHPUnit 11 2024-09-04 12:11:51 +02:00
Alexander M. Turek 0ab26b08b9 Switch to expectUserDeprecationMessage() 2024-09-02 15:38:53 +02:00
Fabien Potencier c070cd719c Drop support for 8.0 2024-08-10 12:32:24 +02:00
Fabien Potencier 6967b721ae Add missing dep 2024-08-08 14:51:19 +02:00
Fabien Potencier 3734ba6a17 Merge branch '3.x' into 4.x
* 3.x:
  Remove usage of uniqid
  Document OPTIMIZE_TEXT_NODES
  Issue #3828: Add sequence and mapping tests
2024-07-01 18:45:00 +02:00
Pierre c5c95a2d5c Issue #3828: Add sequence and mapping tests 2024-06-22 19:48:59 +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
Fabien Potencier 5d5ea62171 Merge branch '3.x' into 4.x
* 3.x:
  Remove support for Twig 2.x and unmaintained Symfony versions
  Clarify the behavior when a property/method does not exist
2024-01-25 09:17:53 +01:00
Fabien Potencier b1a8feaa55 Remove support for Twig 2.x and unmaintained Symfony versions 2024-01-25 08:19:28 +01:00
Fabien Potencier f84c2172bf Remove deprecated code 2023-12-10 21:02:11 +01:00
Fabien Potencier ac423430aa Merge branch '3.x' into 4.x
* 3.x:
  Fix CS
  Move functions for CoreExtension
  Move functions for EscaperExtension
  Move functions for StringLoaderExtension
  Move functions for DebugExtension
  Move functions for MarkdownExtension
  Move functions for InkyExtension
  Move functions for CssInlinerExtension
  Move functions for HtmlExtension
  Deprecate internal extension functions in favor of methods on the extension classes
  Tweak deprecated docs
2023-12-10 20:55:15 +01:00
Fabien Potencier 54d34b969b Move functions for CoreExtension 2023-12-10 20:13:10 +01:00
Fabien Potencier 72071e8ece Move functions for EscaperExtension 2023-12-10 11:49:57 +01:00
Fabien Potencier 196e91dd72 Move functions for StringLoaderExtension 2023-12-10 11:38:36 +01:00
Fabien Potencier d4d016034c Move functions for DebugExtension 2023-12-10 11:35:00 +01:00
Fabien Potencier 16abb69d12 Deprecate internal extension functions in favor of methods on the extension classes 2023-12-09 18:11:17 +01:00
Fabien Potencier f930a284fe Bump to 4.0 and require PHP 8.2 2023-12-09 13:45:50 +01:00
Jérôme Tamarelle 1d5c09285f Use PHP 8.0 functions with polyfill 2023-10-08 17:11:07 +02:00
Christian Flothmann b8b0c39663 allow Symfony 7 packages to be installed 2023-09-11 13:25:50 +02:00
Fabien Potencier fa5f1d4c2e Merge branch '2.x' into 3.x
* 2.x:
  Bump min deps
2023-07-29 17:34:56 +02:00
Fabien Potencier c12990f9e7 Bump min deps 2023-07-29 13:31:08 +02:00
Tobias Meindl d140542c2e Allow psr/container 2.0.2
Should allow psr/container 2.0.2 - not only 1.1.2

Changes:
https://github.com/php-fig/container/compare/2.0.2...1.1.2
2023-02-15 10:01:39 +01:00
Fabien Potencier 08d2037f26 Bump version to 3.6 2023-02-09 07:45:16 +01:00
Fabien Potencier 0c8f5b2ea4 Bump version to 3.5 2022-12-27 13:23:36 +01:00
Fabien Potencier ed19f4bf9d Prepare the 3.4.0 release 2022-05-15 08:25:28 +02:00
Fabien Potencier 2fcc95728f Prepare the 2.15.0 release 2022-05-15 08:21:48 +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
Nicolas Grekas 1e53d27a37 Merge branch '2.x' into 3.x
* 2.x:
  Allow Symfony 6
2021-05-20 16:28:34 +02:00
Nicolas Grekas ea5de7e626 Allow Symfony 6 2021-05-20 16:22:31 +02:00
Fabien Potencier d56d9b13be Bump version to 3.3.0 2021-02-08 10:54:03 +01:00
Fabien Potencier bc4f0e2d62 Prepare the 3.2.0 release 2021-01-05 11:22:42 +01:00
Fabien Potencier dbc45e2421 Merge branch '1.x' into 2.x
* 1.x:
  Drop support for PHP 7.1
  Update CHANGELOG
  Emphase the fact that the include tag outputs data
  Update ChANGELOG
2020-10-21 12:24:53 +02:00
Fabien Potencier 83d8e43136 Drop support for PHP 7.1 2020-10-21 12:11:02 +02:00
Fabien Potencier b62e30eff1 Bump version 2020-08-23 14:03:42 +02:00
Fabien Potencier 7c3f4ec8e9 Bump version 2020-08-23 14:01:50 +02:00
Fabien Potencier c6927de9e7 Bump version 2020-08-23 13:59:06 +02:00
Nicolas Grekas 3aa40a42b3 Merge branch '2.x' into 3.x
* 2.x:
  Try running all tests on nightly
  Minor fixes
  Fix Travis config
2020-05-21 11:56:39 +02:00