54 Commits

Author SHA1 Message Date
Fabien Potencier f640320202 Merge branch '3.x' into 4.x
* 3.x: (26 commits)
  Remove the documentation comments compilation overhead
  Clarify source function trust requirements
  Throw on PCRE errors in the matches operator
  Document that reusing a non-rewindable iterator after destructuring is unsupported
  Release destructuring temporaries after assignment
  Deprecate prefixed macro definedness checks
  Fix duplicate macro deprecation wording
  Throw when list formatting fails
  Document that sequence destructuring consumes one value per pattern slot
  Fix the html_attr documentation about iterables in data attributes
  Warn about untrusted input with the default Tempest markdown converter
  Document that overriding MacroNode::compile() is not supported anymore
  Merge overlapping CHANGELOG entries for the destructuring fatal error fix
  Document that include_only keeps global variables available
  Remove lazy macro import resolution
  Honor date formatter prototype calendars
  Fix Stringable keys for ArrayAccess implementations
  Fix repeated object destructuring evaluation
  Restore void return type compatibility for extension points
  Reject destructuring patterns containing no variables
  ...

# Conflicts:
#	CHANGELOG
#	doc/deprecated.rst
#	doc/filters/format_datetime.rst
#	extra/twig-extra-bundle/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php
#	extra/twig-extra-bundle/DependencyInjection/TwigExtraExtension.php
#	extra/twig-extra-bundle/TwigExtraBundle.php
#	src/MacroNamespace.php
#	src/Node/MacrosNode.php
#	src/Parser.php
#	src/Test/IntegrationTestCase.php
#	src/Test/NodeTestCase.php
#	tests/CallMacroTest.php
#	tests/ExpressionParserTest.php
#	tests/Fixtures/macros/duplicate_definition.legacy.test
#	tests/Node/MacrosTest.php
#	tests/ParserTest.php
2026-08-29 00:25:20 +02:00
Fabien Potencier 4212ac1303 Test extra extension catalog against local sources 2026-08-23 09:13:10 +02:00
Fabien Potencier 83f264bcd8 Merge branch '3.x' into 4.x
* 3.x:
  Allow Symfony 8 packages in Twig extra packages
  Fix array typehint for $variants in HtmlExtension
2025-11-02 20:03:33 +01:00
Javier Eguiluz 9a8a1dc1dd Allow Symfony 8 packages in Twig extra packages 2025-11-02 12:00:49 +01:00
Fabien Potencier b03de9de05 Merge branch '3.x' into 4.x
* 3.x:
  Update CHANGELOG
  Fix accessing arrays with stringable objects as key
  Update inky_to_html.rst: Updating link
  Update replace.rst
  [Doc] Tweaks in the escaping article
  Compile 'index' with repr (not string) in EmbedNode
  Introduce registerUndefinedTestCallback
  Fix intl test
  Bump minimum Commonmark requirement
  Support two words test guard
  Bump version
  Improve documentation examples for `enum` and `enum_cases`
  Avoid errors when failing to guess the template info for an error
  Add note to format_datetime explaining how to install required extensions
  Fix compatibility layer
2025-10-29 11:55:46 -04:00
Fabien Potencier 8f970764e6 Bump minimum Commonmark requirement 2025-09-15 07:57:37 +02:00
Fabien Potencier dc6356268b Bump min PHP version to 8.1 2025-01-31 21:45:36 +01:00
Fabien Potencier 9b9196c9d6 Merge branch '3.x' into 4.x
* 3.x:
  Deprecate the sandbox tag
  Removed @internal on Environment::getGlobals()
  Clarify docs on registerUndefinedTokenParserCallback()
  Simplify code
2024-09-10 22:43:00 +02:00
Fabien Potencier a240eff47e Simplify code 2024-09-10 08:27:46 +02:00
Alexander M. Turek f2053bbea0 PHPUnit 11 2024-09-04 12:11:51 +02:00
Fabien Potencier 06ac86e3dd Merge branch '3.x' into 4.x
* 3.x:
  Fix tests
  Allow extra extensions to use Twig 4
2024-09-01 23:00:16 +02:00
Fabien Potencier 031c7bda4d Allow extra extensions to use Twig 4 2024-09-01 22:39:12 +02:00
Fabien Potencier c070cd719c Drop support for 8.0 2024-08-10 12:32:24 +02: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 f930a284fe Bump to 4.0 and require PHP 8.2 2023-12-09 13:45:50 +01:00
Fabien Potencier fdb9d9eddf Bump dependencies 2023-11-21 15:02:01 +01: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
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 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 3cefebac2b feature #3559 Allow CommonMark extensions to easily be added (kbond)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Allow CommonMark extensions to easily be added

1. I discovered that commonmark 2 works just fine with `markdown-extra` so I added to the `require-dev` of `markdown-extra`'s `composer.json`
2. Added `LeagueMarkdownFactory` to `markdown-extra` as discussed in #3558
3. In `twig-extra-bundle`, if commonmark (and the above factory) is available, wire up the factory with extensions added via the `twig.markdown.league_extension` DI tag

If this PR would be acceptable, I can add some tests.

(closes #3558)

Commits
-------

4b86f5ef Allow CommonMark extensions to easily be added
2022-01-02 16:32:49 +01:00
Kevin Bond 4b86f5efdc Allow CommonMark extensions to easily be added 2022-01-02 16:32:46 +01:00
Fabien Potencier 33ed3b7e33 Merge branch '2.x' into 3.x
* 2.x:
  Upgrade to version 4.4 lts at least
2021-11-13 17:20:21 +01:00
noniagriconomie 315e16f5df Upgrade to version 4.4 lts at least 2021-11-08 13:29:10 +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
Ryan Weaver ef15dd3abf Allowing compat with Twig 2 by conditionally calling method 2021-02-06 16:13:17 -05:00
sylvia-vdv 3dfcaec0ce require twig/twig ^3.2 2021-01-05 16:13:50 +01:00
Fabien Potencier 4d036a9148 Add a cache tag 2021-01-05 10:59:10 +01:00
Fabien Potencier cb88e0a68c Merge branch '2.x' into 3.x
* 2.x:
  Move things around
2021-01-01 15:58:18 +01:00
Fabien Potencier 1868918724 Move things around 2021-01-01 15:53:48 +01:00
Fabien Potencier b0afeb512e Merge branch '2.x' into 3.x
* 2.x:
  Move Extra Bundle config from XML to PHP
  bump license year
2021-01-01 15:33:39 +01:00
Fabien Potencier b9712ce137 Move Extra Bundle config from XML to PHP 2021-01-01 15:29:30 +01:00
Fabien Potencier 351a97ed15 Fix Composer version 2021-01-01 10:05:00 +01:00
Fabien Potencier dae3868f04 Fix Composer version 2021-01-01 10:02:52 +01: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
Nicolas Grekas 4e0008cd82 Try running all tests on nightly 2020-05-21 11:54:27 +02:00
Fabien Potencier d57e50d778 Merge branch '2.x' into 3.x
* 2.x:
  Allow dev versions
  Allow PHP 8 for extra packages
  Fix Travis
  Bump version to 2.13
  Fix integration tests
  Fix PHP 8 compat
  Install the phpunit-bridge with PHP 7.4 when testing nightly
  Add PHP 8 / nightly in Travis matrix
  Drop support for PHP 7.0
2020-05-19 15:23:33 +02:00
Fabien Potencier 9270d3e0e0 Allow dev versions 2020-05-19 15:17:30 +02:00
Fabien Potencier 2d58a54b4a Allow PHP 8 for extra packages 2020-05-19 15:12:25 +02:00
Fabien Potencier e5ae15e7de Merge branch '2.x' into 3.x
* 2.x:
  support Sf5
  Fix constraints
  Update doc with new escaping behavior
  Remove obsolete page
  language typo
  Add missing suggestions in Twig Extra Bundle
2019-12-28 08:09:27 +01:00
Fabien Potencier 966fa45126 Fix constraints 2019-12-27 08:33:44 +01:00
Fabien Potencier e5b29ee1f7 Merge branch '2.x' into 3.x
* 2.x:
  cleaned up the code
  Fix intl-extra docs and links
  removed unneeded condition
  moved mime to req
2019-08-12 09:27:28 +02:00
Fabien Potencier ba8f7a5e4c cleaned up the code 2019-08-12 09:23:06 +02:00
Fabien Potencier 4d34327368 fixed versions of extra exts 2019-08-10 16:56:24 +02:00
Fabien Potencier b41eb45c3b fixed typo 2019-08-10 16:08:18 +02:00