Commit Graph

293 Commits

Author SHA1 Message Date
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
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 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
Pierre Grimaud 0273057622 Fix typos 2020-04-24 08:22:30 +02:00
Fabien Potencier 77b423caf3 Merge branch '2.x' into 3.x
* 2.x:
  Fix wrong link
2020-03-31 08:42:17 +02:00
Fabien Potencier e3ff236877 Fix wrong link 2020-03-31 08:42:10 +02:00
Fabien Potencier 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
Ruud Kamphuis caecd2a528 IntlExtension > Return empty string when input is null 2020-02-13 14:23:56 +01:00
Massimiliano Arione 12028697f1 allow null string in StringExtension
Fix #3250
2020-02-11 16:24:50 +01:00
Fabien Potencier 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 allow null string in StringExtension
2020-02-11 16:23:56 +01:00
Fabien Potencier 8ce28d9d67 Merge branch '2.x' into 3.x
* 2.x:
  IntlExtension > Handle MissingResourceException
2020-02-11 06:45:44 +01:00
Massimiliano Arione cf63844c18 allow null string in StringExtension
Fix #3250
2020-02-06 16:26:33 +01:00
Ruud Kamphuis 2df6814c27 IntlExtension > Handle MissingResourceException 2020-02-05 19:09:57 +01:00
Fabien Potencier 9a8b0c60ae Merge branch '2.x' into 3.x
* 2.x:
  lower php requirement
2020-01-02 19:49:34 +01:00
Guite c3b4b8ee53 lower php requirement 2020-01-02 13:43:40 +01: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 7f75a23f85 minor #3230 Fix constraints (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Fix constraints

Commits
-------

966fa451 Fix constraints
2019-12-27 08:37:45 +01:00
Axel Guckelsberger d735a43e4e support Sf5 2019-12-27 08:36:07 +01:00
Fabien Potencier 966fa45126 Fix constraints 2019-12-27 08:33:44 +01:00
Fabien Potencier 8c2c193a29 Add missing suggestions in Twig Extra Bundle 2019-12-11 11:08:55 +01:00
Fabien Potencier 566305d940 Merge branch '2.x' into 3.x
* 2.x:
  Fix number formatter in Intl extra extension
  Fix README
2019-11-15 21:33:33 +01:00
Fabien Potencier 34a2a74596 bug #3198 Fix number formatter in Intl extra extension (fabpot)
This PR was squashed before being merged into the 2.x branch (closes #3198).

Discussion
----------

Fix number formatter in Intl extra extension

Commits
-------

a6cf3f3f Fix number formatter in Intl extra extension
2019-11-15 21:27:23 +01:00
Fabien Potencier a6cf3f3f37 Fix number formatter in Intl extra extension 2019-11-15 21:27:18 +01:00
Fabien Potencier ddad9d8c98 Fix README 2019-11-15 17:07:38 +01:00
Fabien Potencier c38d104978 Merge branch '2.x' into 3.x
* 2.x:
  Allow Symfony 5
  Fix small typo
  Bump version to 2.12.2-DEV
  Prepare the 2.12.1 release
2019-10-23 17:58:03 +02:00
Nicolas Grekas 4ab02e3e9f Allow Symfony 5 2019-10-23 17:53:29 +02: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
Fabien Potencier 5750a13b40 Add missing .gitattributes for string-extra 2019-10-17 09:28:42 +02:00
Fabien Potencier 38adb199ea minor #3153 Update .gitattributes to remove tests from "dist" (barryvdh)
This PR was squashed before being merged into the 2.x branch (closes #3153).

Discussion
----------

Update .gitattributes to remove tests from "dist"

This was proposed many times before, but considering https://github.com/symfony/symfony/pull/33579 is now merged, I propose this again. I refer to that issue as for the reasoning, as it applies here also.

I did not add the `docs` directory as there was much discussion about that before (discussion in  #942)

Related: #942 #1776 #1981 #2292 #2799 2905

Commits
-------

5cde1f50 Update .gitattributes to remove tests from \"dist\"
2019-10-17 09:27:12 +02:00
Barry vd. Heuvel 5cde1f50bb Update .gitattributes to remove tests from \"dist\" 2019-10-17 09:27:07 +02:00
Fabien Potencier 035649b70b Merge branch '2.x' into 3.x
* 2.x:
  Add string extra in the bundle
  Add missing docs
  Add twig/string-extra extension
2019-10-17 09:21:36 +02:00
Fabien Potencier 069fd6db49 Add string extra in the bundle 2019-10-17 09:13:47 +02:00
Fabien Potencier 00e0b53100 Add missing docs 2019-10-17 08:49:30 +02:00
Nicolas Grekas e300e37940 Add twig/string-extra extension 2019-10-16 19:46:20 +02:00
Fabien Potencier 241f8dffb9 Merge branch '2.x' into 3.x
* 2.x:
  Update documentation for inky_to_html
  Bump version to 2.12.1-DEV
  Prepare the 2.12.0 release
  Update CHANGELOG
2019-10-16 10:32:27 +02:00
Tugdual Saunier ae50257dd0 Update documentation for inky_to_html 2019-10-16 10:29:01 +02:00