Commit Graph

138 Commits

Author SHA1 Message Date
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 5aad8295af Merge branch '2.x' into 3.x
* 2.x:
  Bump license year
  Typo fix : "flexiblity" ➤ "flexibility"
  allow translation-contracts:^3
2022-01-02 11:02:25 +01:00
Fabien Potencier ce97157b43 Bump license year 2022-01-02 11:02:19 +01:00
Michał Jusięga 0c1e4edc8b allow translation-contracts:^3 2021-12-22 17:41:26 +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
Fabien Potencier 7cf279d3d6 Merge branch '2.x' into 3.x
* 2.x:
  [TwigExtraBundle] Add the return type information in getConfigTreeBuilder()
2021-11-05 17:53:41 +01:00
Javier Eguiluz 26654f653f [TwigExtraBundle] Add the return type information in getConfigTreeBuilder() 2021-11-05 16:54:01 +01:00
Antoine Makdessi 9286dacb0b Update README.md 2021-10-18 09:47:52 +02:00
Fabien Potencier e109bbdfa3 Merge branch '2.x' into 3.x
* 2.x:
  Update markdown-to-html converter missing message
  Fix CS
  Missing Environment and LoaderInterface
2021-09-29 14:18:02 +02:00
Tobias Feijten 46d21545a6 Update markdown-to-html converter missing message
The `league/html-to-markdown` library does not support Markdown to HTML conversion (anymore?). The `league/commonmark` library is suitable for that.
2021-09-29 14:16:54 +02:00
Fabien Potencier 6ae5ae5c7d Merge branch '2.x' into 3.x
* 2.x:
  Update Markdown packages
2021-07-07 09:08:18 +02:00
noniagriconomie 479336e09f Update Markdown packages 2021-07-07 09:07:49 +02:00
Andrej Hudec 49bac0b137 Fix typo in CacheTokenParser.php 2021-06-21 21:48:00 +02: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 fcbaa669ab Fix CS 2021-05-12 09:47:40 +02:00
Fabien Potencier 13e360972a Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Fix CS
  Migrate to the new PHP CS Fixer config file
  Fixing links
2021-05-12 09:45:40 +02:00
Fabien Potencier 2dd1d909b9 Fix CS 2021-05-12 09:37:17 +02:00
Fabien Potencier 6833f77550 Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Slug filter: Mentioning requiredStringExtension
  Fix CS
  Added installation instructions
2021-04-07 17:50:10 +02:00
Fabien Potencier 5b5cfd8680 Fix CS 2021-04-07 17:42:46 +02:00
Thomas Landauer 4e2fd8f216 Added installation instructions 2021-04-07 17:41:24 +02:00
Fabien Potencier 69c4e24d6a Merge branch '2.x' into 3.x
* 2.x:
  Allow installation of league/html-to-markdown 5.x
2021-04-01 14:19:25 +02:00
Colin O'Dell 2c6fa0236a Allow installation of league/html-to-markdown 5.x 2021-03-31 09:56:20 -04:00
Ryan Weaver ef15dd3abf Allowing compat with Twig 2 by conditionally calling method 2021-02-06 16:13:17 -05:00
Fabien Potencier 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
Émile Perron 0fd67941be Add slug filter (follow-up to PR #3386) 2021-01-29 15:39:04 +01:00
Yann ROTROU 0bdad6fbdc Allow macro calls and definition inside cache tag 2021-01-11 18:30:42 +01:00
Fabien Potencier 3c4fe439b8 Fix compat with older Symfony versions 2021-01-05 16:24:51 +01:00
Fabien Potencier 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
Fabien Potencier f4e1429227 Fix compat with older Symfony versions 2021-01-05 16:21:23 +01:00
sylvia-vdv 3dfcaec0ce require twig/twig ^3.2 2021-01-05 16:13:50 +01:00
Nicolas Grekas fff62b9eb1 Improve wiring 2021-01-05 10:59:10 +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
abdounikarim bed8f31b96 bump license year 2021-01-01 10:21:03 +01:00
Fabien Potencier 351a97ed15 Fix Composer version 2021-01-01 10:05:00 +01:00
Fabien Potencier 5162646cfa Merge branch '2.x' into 3.x
* 2.x:
  Fix Composer version
2021-01-01 10:04:14 +01:00
Fabien Potencier dae3868f04 Fix Composer version 2021-01-01 10:02:52 +01:00
Fabien Potencier 81751d6671 Add "registerUndefinedTokenParserCallback" 2020-12-31 09:12:48 +01:00
Fabien Potencier 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
Oskar Stark fdafd40626 Enhancement: Use GithubActions instead of Travis for tests 2020-11-05 14:17:52 +01:00
Fabien Potencier 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
Jérôme TAMARELLE 9a83f7edf6 Fix compatibility with PHPUnit 10 2020-07-29 03:03:03 +02:00
Fabien Potencier c83ede7fcd Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Fix CS
2020-06-22 08:17:05 +02:00
Fabien Potencier c38f96318b Fix CS 2020-06-22 08:15:56 +02:00