5268 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	655c7a531b	Fix Travis	2020-05-19 15:09:00 +02:00
Fabien Potencier	36be0cd585	Bump version to 2.13	2020-05-19 15:07:44 +02:00
Fabien Potencier	2d5e36b759	Merge branch '1.x' into 2.x ... * 1.x: 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:03:51 +02:00
Fabien Potencier	78348c0cc6	bug #3331 Fix PHP 8.0 compat (fabpot, nicolas-grekas) ... This PR was merged into the 1.x branch. Discussion ---------- Fix PHP 8.0 compat Commits ------- 8b1f0c7f Fix integration tests 6a0ab744 Fix PHP 8 compat b952011f Install the phpunit-bridge with PHP 7.4 when testing nightly 914d945e Add PHP 8 / nightly in Travis matrix	2020-05-19 14:57:25 +02:00
Nicolas Grekas	8b1f0c7f7e	Fix integration tests	2020-05-19 14:52:37 +02:00
Fabien Potencier	6a0ab744d2	Fix PHP 8 compat	2020-05-19 14:22:31 +02:00
Nicolas Grekas	b952011f95	Install the phpunit-bridge with PHP 7.4 when testing nightly	2020-05-19 14:20:19 +02:00
Fabien Potencier	914d945e94	Add PHP 8 / nightly in Travis matrix	2020-05-19 12:39:01 +02:00
Fabien Potencier	dbbc1e9d26	minor #3332 Drop support for PHP 7.0 (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Drop support for PHP 7.0 Commits ------- 9810bf55 Drop support for PHP 7.0	2020-05-19 12:24:53 +02:00
Fabien Potencier	9810bf558a	Drop support for PHP 7.0	2020-05-19 12:19:14 +02:00
Fabien Potencier	427325c205	Merge branch '2.x' into 3.x ... * 2.x: Drop PHP 5 support Deprecation documentation indentation	2020-05-19 07:39:17 +02:00
Fabien Potencier	25923f7d02	Merge branch '1.x' into 2.x ... * 1.x: Drop PHP 5 support	2020-05-19 07:38:33 +02:00
Fabien Potencier	b2f19ec0a2	minor #3330 Drop PHP 5 support (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Drop PHP 5 support PHP 5.6 has been unsopported for 2.5 years now and bumping min version to 7.0 will ease supporting PHP 8.0. Commits ------- 52028f91 Drop PHP 5 support	2020-05-19 07:06:19 +02:00
Fabien Potencier	52028f91eb	Drop PHP 5 support	2020-05-19 07:02:07 +02:00
Fabien Potencier	5a1304b2ec	minor #3329 Deprecation documentation indentation (alexlongshaw) ... This PR was merged into the 2.x branch. Discussion ---------- Deprecation documentation indentation Fix the indentation in Errors on "Deprecated Features" and add missing full stop Commits ------- af2ab405 Deprecation documentation indentation	2020-05-18 08:42:19 +02:00
Alex Longshaw	af2ab405f0	Deprecation documentation indentation ... Fix the indentation in Errors on "Deprecated Features" and add missing full stop	2020-05-17 14:50:59 +01: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
Fabien Potencier	60e2bda53d	Fix an exmaple	2020-05-11 10:19:36 +02:00
Fabien Potencier	124034199e	bug #3325 Fix transform call to Michelf\MarkdownExtra (gerryd) ... This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead. Discussion ---------- 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. Commits ------- 85a8a47b Fix transform call to Michelf\MarkdownExtra	2020-05-11 10:02:41 +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	d0e2074a04	minor #3315 Optimize file_exists() (fabpot) ... This PR was merged into the 3.x branch. Discussion ---------- Optimize file_exists() Commits ------- f05ccdd6 Optimize fil_exists()	2020-04-24 10:08:58 +02:00
Fabien Potencier	f05ccdd657	Optimize fil_exists()	2020-04-24 09:48:53 +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
Fabien Potencier	de4e46e77e	Merge branch '1.x' into 2.x ... * 1.x: Update api.rst Fix typo Fix CI on PHP5	2020-04-24 08:31:39 +02:00
Fabien Potencier	d69dc2b207	minor #3311 Update api.rst (Yohann76) ... This PR was submitted for the 3.x branch but it was squashed and merged into the 1.x branch instead. Discussion ---------- Update api.rst formating improve Commits ------- abe625a1 Update api.rst	2020-04-24 08:25:23 +02:00
Yohann Durand	abe625a1a1	Update api.rst	2020-04-24 08:25:17 +02:00
Fabien Potencier	76e8f1312e	Fix typo	2020-04-24 08:24:03 +02:00
Fabien Potencier	889bd071c6	minor #3314 Fix typos (pgrimaud) ... This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead. Discussion ---------- Fix typos Hello, This PR will fix : - 1 typo in `doc/filters/country_name.rst` - 1 typo in `doc/filters/currency_name.rst` - 1 typo in `doc/filters/currency_symbol.rst` - 1 typo in `doc/filters/data_uri.rst` - 1 typo in `doc/filters/format_currency.rst` - 1 typo in `doc/filters/format_date.rst` - 1 typo in `doc/filters/format_datetime.rst` - 1 typo in `doc/filters/format_number.rst` - 1 typo in `doc/filters/format_time.rst` - 1 typo in `doc/filters/html_to_markdown.rst` - 1 typo in `doc/filters/inky_to_html.rst` - 1 typo in `doc/filters/inline_css.rst` - 1 typo in `doc/filters/language_name.rst` - 1 typo in `doc/filters/locale_name.rst` - 1 typo in `doc/filters/markdown_to_html.rst` - 1 typo in `doc/filters/timezone_name.rst` - 1 typo in `doc/functions/country_timezones.rst` - 1 typo in `doc/functions/html_classes.rst` - 1 typo in `doc/tags/macro.rst` - 1 typo in `extra/html-extra/src/HtmlExtension.php` - 1 typo in `src/Extension/EscaperExtension.php` Cheers! 🤖 Commits ------- 02730576 Fix typos	2020-04-24 08:22:36 +02:00
Pierre Grimaud	0273057622	Fix typos	2020-04-24 08:22:30 +02:00
Fabien Potencier	f88cbfdd17	minor #3309 Fix CI on PHP5 (nicolas-grekas) ... This PR was merged into the 1.x branch. Discussion ---------- Fix CI on PHP5 Commits ------- 27479d65 Fix CI on PHP5	2020-04-22 23:35:26 +02:00
Nicolas Grekas	27479d6524	Fix CI on PHP5	2020-04-06 19:23:50 +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	cc260638d8	Merge branch '2.x' into 3.x ... * 2.x: Fix CI	2020-03-30 15:10:24 +02:00
Fabien Potencier	f88d55308f	minor #3305 Fix CI (nicolas-grekas) ... This PR was merged into the 2.x branch. Discussion ---------- Fix CI Commits ------- 67ccd626 Fix CI	2020-03-30 15:08:57 +02:00
Nicolas Grekas	67ccd6269e	Fix CI	2020-03-30 14:46:07 +02:00
Fabien Potencier	f046f50d16	Merge branch '2.x' into 3.x ... * 2.x: Fix typo [docs] CoreExtension::setEscaper is deprecated	2020-03-30 13:41:14 +02:00
Fabien Potencier	0190450d97	Fix typo	2020-03-30 13:39:48 +02:00
Fabien Potencier	0b8e1a9f4a	minor #3304 [docs] CoreExtension::setEscaper is deprecated (SpacePossum) ... This PR was merged into the 2.x branch. Discussion ---------- [docs] CoreExtension::setEscaper is deprecated Commits ------- 628fde13 [docs] CoreExtension::setEscaper is deprecated	2020-03-30 13:38:49 +02:00
SpacePossum	628fde13ba	[docs] CoreExtension::setEscaper is deprecated	2020-03-30 12:14:13 +02:00
Fabien Potencier	8b516c453a	Merge branch '2.x' into 3.x ... * 2.x: Remove extra Mardown word in classname	2020-03-27 17:41:09 +01:00
XenoX	6df2e2c318	Remove extra Mardown word in classname	2020-03-27 17:41:01 +01:00
Fabien Potencier	0e1f207c12	minor #3301 Remove extra Mardown word in classname (XenoX) ... This PR was merged into the 3.x branch. Discussion ---------- Remove extra Mardown word in classname Commits ------- e76bd98a Remove extra Mardown word in classname	2020-03-27 17:39:35 +01:00
XenoX	e76bd98a78	Remove extra Mardown word in classname	2020-03-25 23:15:20 +01:00
Fabien Potencier	a6f64395b3	Merge branch '2.x' into 3.x ... * 2.x: fix node class namespace	2020-03-24 13:35:36 +01:00
Fabien Potencier	27af7d9cd1	Merge branch '1.x' into 2.x ... * 1.x: fix node class namespace	2020-03-24 13:35:30 +01:00
Fabien Potencier	a940d78909	minor #3300 fix node class namespace (xabbuh) ... This PR was merged into the 1.x branch. Discussion ---------- fix node class namespace Commits ------- 06ff4bdf fix node class namespace	2020-03-24 13:33:44 +01:00