ef15dd3abf
Allowing compat with Twig 2 by conditionally calling method
2021-02-06 16:13:17 -05:00
a8d40e3a4a
Merge branch '2.x' into 3.x
...
* 2.x:
Add slug filter (follow-up to PR #3386 )
2021-01-29 15:39:43 +01:00
0fd67941be
Add slug filter (follow-up to PR #3386 )
2021-01-29 15:39:04 +01:00
0bdad6fbdc
Allow macro calls and definition inside cache tag
2021-01-11 18:30:42 +01:00
3c4fe439b8
Fix compat with older Symfony versions
2021-01-05 16:24:51 +01:00
24fc19a36e
Merge branch '2.x' into 3.x
...
* 2.x:
Fix compat with older Symfony versions
Prepare the 2.14.2 release
2021-01-05 16:24:12 +01:00
f4e1429227
Fix compat with older Symfony versions
2021-01-05 16:21:23 +01:00
3dfcaec0ce
require twig/twig ^3.2
2021-01-05 16:13:50 +01:00
fff62b9eb1
Improve wiring
2021-01-05 10:59:10 +01:00
4d036a9148
Add a cache tag
2021-01-05 10:59:10 +01:00
cb88e0a68c
Merge branch '2.x' into 3.x
...
* 2.x:
Move things around
2021-01-01 15:58:18 +01:00
1868918724
Move things around
2021-01-01 15:53:48 +01:00
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
b9712ce137
Move Extra Bundle config from XML to PHP
2021-01-01 15:29:30 +01:00
bed8f31b96
bump license year
2021-01-01 10:21:03 +01:00
351a97ed15
Fix Composer version
2021-01-01 10:05:00 +01:00
5162646cfa
Merge branch '2.x' into 3.x
...
* 2.x:
Fix Composer version
2021-01-01 10:04:14 +01:00
dae3868f04
Fix Composer version
2021-01-01 10:02:52 +01:00
81751d6671
Add "registerUndefinedTokenParserCallback"
2020-12-31 09:12:48 +01:00
22537dd1c4
Merge branch '2.x' into 3.x
...
* 2.x:
Fix small typo
Fix: Typo
Enhancement: Use GithubActions instead of Travis for tests
Fix: DOCtor-RST build
Enhancement: Use no_explicit_use_of_code_block_php rule
Fix: Highlighting
Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
Enhancement: Use GithubActions instead of Travis for tests
Fix `odd` not working for negative numbers
Bump version to 2.14.2-DEV
Prepare the 2.14.1 release
Update CHANGELOG
Bump version to 1.44.2-DEV
Prepare the 1.44.1 release
2020-11-05 18:38:00 +01:00
fdafd40626
Enhancement: Use GithubActions instead of Travis for tests
2020-11-05 14:17:52 +01:00
0fdf96c389
Merge branch '2.x' into 3.x
...
* 2.x:
Add a test
Fix typo
Fix compatibility with PHPUnit 10
Update doc for macro with embed tags
fix typo in ApplyTokenParser PHP doc
Fixes #3351
2020-08-05 16:54:08 +02:00
9a83f7edf6
Fix compatibility with PHPUnit 10
2020-07-29 03:03:03 +02:00
c83ede7fcd
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Fix CS
2020-06-22 08:17:05 +02:00
c38f96318b
Fix CS
2020-06-22 08:15:56 +02:00
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
4e0008cd82
Try running all tests on nightly
2020-05-21 11:54:27 +02:00
090a7d86a7
Merge branch '2.x' into 3.x
...
* 2.x:
Fix extra package deps
2020-05-21 08:01:55 +02:00
74f3ffe4b6
Fix extra package deps
2020-05-21 08:01:43 +02:00
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
9270d3e0e0
Allow dev versions
2020-05-19 15:17:30 +02:00
2d58a54b4a
Allow PHP 8 for extra packages
2020-05-19 15:12:25 +02:00
58296c9716
Merge branch '2.x' into 3.x
...
* 2.x:
Fix an exmaple
Fix transform call to Michelf\MarkdownExtra
2020-05-11 10:23:44 +02:00
85a8a47bb1
Fix transform call to Michelf\MarkdownExtra
...
As per the documentation here:
https://michelf.ca/projects/php-markdown/configuration/#configure
Calling defaultTransform() will use the default options, thus ignoring
the "hard_wrap" option. Calling transform() instead, which takes the
options into account.
2020-05-11 10:02:35 +02:00
050fdf54b8
Merge branch '2.x' into 3.x
...
* 2.x:
Update api.rst
Fix typo
Fix typos
Fix CI on PHP5
2020-04-24 08:31:57 +02:00
0273057622
Fix typos
2020-04-24 08:22:30 +02:00
77b423caf3
Merge branch '2.x' into 3.x
...
* 2.x:
Fix wrong link
2020-03-31 08:42:17 +02:00
e3ff236877
Fix wrong link
2020-03-31 08:42:10 +02:00
84e87b5648
Merge branch '2.x' into 3.x
...
* 2.x:
IntlExtension > Return empty string when input is null
2020-02-13 14:24:27 +01:00
caecd2a528
IntlExtension > Return empty string when input is null
2020-02-13 14:23:56 +01:00
12028697f1
allow null string in StringExtension
...
Fix #3250
2020-02-11 16:24:50 +01:00
f76e81e9e8
bug #3259 allow null string in StringExtension (garak)
...
This PR was merged into the 3.x branch.
Discussion
----------
allow null string in StringExtension
Fix #3250
Commits
-------
cf63844c
2020-02-11 16:23:56 +01:00
8ce28d9d67
Merge branch '2.x' into 3.x
...
* 2.x:
IntlExtension > Handle MissingResourceException
2020-02-11 06:45:44 +01:00
cf63844c18
allow null string in StringExtension
...
Fix #3250
2020-02-06 16:26:33 +01:00
2df6814c27
IntlExtension > Handle MissingResourceException
2020-02-05 19:09:57 +01:00
9a8b0c60ae
Merge branch '2.x' into 3.x
...
* 2.x:
lower php requirement
2020-01-02 19:49:34 +01:00
c3b4b8ee53
lower php requirement
2020-01-02 13:43:40 +01:00
2a740e6268
Merge branch '2.x' into 3.x
...
* 2.x:
Bump license year
Bump license year
2020-01-01 18:11:09 +01:00
6aae22ecde
Bump license year
2020-01-01 18:10:47 +01:00
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
Ryan Weaver
Fabien Potencier
Émile Perron
Yann ROTROU
sylvia-vdv
Nicolas Grekas
abdounikarim
Oskar Stark
Jérôme TAMARELLE
Gerry Demaret
Pierre Grimaud
Ruud Kamphuis
Massimiliano Arione
Guite