Commit Graph

84 Commits

Author SHA1 Message Date
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
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 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
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
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 dae3868f04 Fix Composer version 2021-01-01 10:02: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
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 090a7d86a7 Merge branch '2.x' into 3.x
* 2.x:
  Fix extra package deps
2020-05-21 08:01:55 +02:00
Fabien Potencier 74f3ffe4b6 Fix extra package deps 2020-05-21 08:01:43 +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 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
Gerry Demaret 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
Fabien Potencier 2a740e6268 Merge branch '2.x' into 3.x
* 2.x:
  Bump license year
  Bump license year
2020-01-01 18:11:09 +01:00
Fabien Potencier 6aae22ecde Bump license year 2020-01-01 18:10:47 +01: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 9e0b90b27b Merge branch '2.x' into 3.x
* 2.x:
  Add .gitattributes
  Add missing .gitattributes for string-extra
  Update .gitattributes to remove tests from \"dist\"
  Fix CS
  doc: number_format add math calculation hint
2019-10-17 09:30:08 +02:00
Barry vd. Heuvel 5cde1f50bb Update .gitattributes to remove tests from \"dist\" 2019-10-17 09:27:07 +02:00
Fabien Potencier 4d34327368 fixed versions of extra exts 2019-08-10 16:56:24 +02:00
Fabien Potencier 7fedcba568 disabled some tests that are not compatible with pHp 7.4 yet 2019-08-10 15:48:29 +02:00
Fabien Potencier f3355fe878 fixed wrong class usage 2019-08-10 14:59:27 +02:00
Fabien Potencier 51242d807f made a class final 2019-08-10 14:48:51 +02:00
Fabien Potencier 741ea46e02 added the Markdown extension 2019-08-10 11:29:35 +02:00