0b6e824ea8
Merge branch '3.x' into 4.x
...
* 3.x:
Add void return type hint even in tests
Run php-cs-fixer sequentially so the void_return src-only customiser is applied
Fix CHANGELOG
[Intl] Add format_list filter using PHP 8.5's IntlListFormatter
# Conflicts:
# .github/workflows/ci.yml
# CHANGELOG
# extra/cssinliner-extra/Tests/LegacyFunctionsTest.php
# extra/html-extra/Tests/CvaTest.php
# extra/html-extra/Tests/HtmlAttrMergeTest.php
# extra/html-extra/Tests/HtmlAttrTest.php
# extra/html-extra/Tests/LegacyFunctionsTest.php
# extra/inky-extra/Tests/LegacyFunctionsTest.php
# extra/markdown-extra/Tests/FunctionalTest.php
# extra/markdown-extra/Tests/LegacyFunctionsTest.php
# extra/twig-extra-bundle/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php
# extra/twig-extra-bundle/DependencyInjection/TwigExtraExtension.php
# extra/twig-extra-bundle/TwigExtraBundle.php
# src/Extension/CoreExtension.php
# src/Extension/EscaperExtension.php
# src/Node/CheckSecurityCallNode.php
# src/Node/Expression/FunctionExpression.php
# src/Node/ModuleNode.php
# src/Node/Node.php
# src/Node/TypesNode.php
# src/Resources/core.php
# src/Resources/debug.php
# src/Test/IntegrationTestCase.php
# tests/CustomExtensionTest.php
# tests/EnvironmentTest.php
# tests/ExpressionParserTest.php
# tests/Extension/CoreTest.php
# tests/Extension/EscaperTest.php
# tests/Extension/LegacyDebugFunctionsTest.php
# tests/Extension/LegacyStringLoaderFunctionsTest.php
# tests/Extension/SandboxStateChangeTest.php
# tests/Extension/SandboxTest.php
# tests/LexerTest.php
# tests/Node/Expression/CallTest.php
# tests/Node/Expression/ConditionalTest.php
# tests/Node/NodeTest.php
# tests/Resources/LegacyCoreTest.php
# tests/TemplateTest.php
# tests/Util/CallableArgumentsExtractorTest.php
2026-07-12 13:55:37 +02:00
9c6d76b61c
Add void return type hint even in tests
2026-07-12 13:43:08 +02:00
8a4b77920a
Add PHPUnit attributes alongside annotations to silence doc-comment metadata deprecations on PHPUnit 11
2026-06-03 18:26:39 +02:00
c649c1658b
Merge branch '3.x' into 4.x
...
* 3.x:
CS fixes
Enable Fabbot as a GHA
2025-07-29 10:27:55 +02:00
85a4817128
CS fixes
2025-07-29 10:07:07 +02:00
fa1c9f0bf9
Merge branch '3.x' into 4.x
...
* 3.x:
Remove obsolete code
Deprecate Environment::mergeGlobals()
Bump version
Prepare the 3.13.0 release
Fix wrong format of `Environment::VERSION_ID` constant
Fix minor things
Fix CS
Fix isset in ForLoopNode
Fix iterable return type
Improve exception expectations reliability
2024-09-07 17:03:10 +02:00
797e490356
Improve exception expectations reliability
2024-09-04 15:22:48 +02:00
f2053bbea0
PHPUnit 11
2024-09-04 12:11:51 +02:00
6ddb76bb76
Make data providers static
2024-09-03 16:32:00 +02:00
6ef13d1e0b
Resolves #4200
2024-08-20 17:30:37 +02:00
e4e95f5b86
Replace template loader mocks by ArrayLoader
2024-07-24 08:27:23 +02:00
2e8acd94ca
Merge branch '2.x' into 3.x
...
* 2.x:
Fix a security issue on filesystem loader (possibility to load a template outside a configured directory)
2022-09-28 10:36:55 +02:00
d6ea14aa84
Merge branch '1.x' into 2.x
...
* 1.x:
Fix a security issue on filesystem loader (possibility to load a template outside a configured directory)
2022-09-28 10:36:46 +02:00
f8009347c4
Fix a security issue on filesystem loader (possibility to load a template outside a configured directory)
2022-07-13 16:03:29 +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
ceb4de0448
Merge branch '1.x' into 2.x
...
* 1.x:
Update CHANGELOG
Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
2021-05-16 14:07:24 +02:00
124f10c27e
Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
...
This reverts commit 83f26e402bf5d3c704df
2021-05-16 14:06:26 +02:00
680e42979a
Merge branch '2.x' into 3.x
...
* 2.x:
Fix code for PHP 8.1
2021-04-10 10:17:37 +02:00
953974a7b3
Fix code for PHP 8.1
2021-04-10 10:14:28 +02:00
f1e0ebc18a
Merge branch '2.x' into 3.x
...
* 2.x:
Fix: A template name cannot be an absolute path
2021-04-07 17:57:57 +02:00
02fe3a544c
Merge branch '1.x' into 2.x
...
* 1.x:
Fix: A template name cannot be an absolute path
2021-04-07 17:57:49 +02:00
3a67fc7dc5
Fix: A template name cannot be an absolute path
2021-04-07 17:57:24 +02:00
879fb0adcc
Merge branch '2.x' into 3.x
...
* 2.x:
removed usage of getmockBuilder() when not needed
removed usage of getmockBuilder() when not needed
2019-08-08 13:35:34 +02:00
656c295ed9
Merge branch '1.x' into 2.x
...
* 1.x:
removed usage of getmockBuilder() when not needed
2019-08-08 13:33:07 +02:00
5861a539e4
removed usage of getmockBuilder() when not needed
2019-08-08 11:59:51 +02:00
5e3ede955b
Merge branch '2.x' into 3.x
...
* 2.x:
Fix PHPUnit deprecations
Update to PhpUnitBridge and fix deprecations
2019-08-08 11:05:13 +02:00
5ebcecf24b
Fix PHPUnit deprecations
2019-08-08 11:03:05 +02:00
c829dafd75
Merge branch '1.x' into 2.x
...
* 1.x:
Update to PhpUnitBridge and fix deprecations
2019-08-08 10:19:01 +02:00
b776e41f5a
Update to PhpUnitBridge and fix deprecations
2019-08-08 09:39:49 +02:00
8fb45863f7
Merge branch '2.x' into 3.x
...
* 2.x:
fixed typo
2019-06-30 15:12:01 +02:00
53d056c861
fixed typo
2019-06-30 15:11:45 +02:00
6823b64cad
moved test under tests/
2019-06-30 14:56:12 +02:00
1e3bb75010
moved test under tests/
2019-06-30 14:51:54 +02:00
22a1317249
moved tests under tests/
2019-06-30 14:48:27 +02:00
Fabien Potencier
Nicolas Grekas
Alexandre Daubois
Alexander M. Turek
Nikola Svitlica a.k.a TheCelavi
Michael Voříšek
Jérémy Derussé