Commit Graph

1142 Commits

Author SHA1 Message Date
René Backhaus 5521e03471 Added return and argument type for LoaderInterface 2020-08-01 09:02:27 +02:00
Fabien Potencier 81e0746b95 Merge branch '2.x' into 3.x
* 2.x:
  Restrict callables to closures in filters
  Fix CS
  Update html_to_markdown.rst
2020-07-05 15:32:53 +02:00
Fabien Potencier 5e1c4a63be Fix CS 2020-07-05 15:27:01 +02:00
Thomas Landauer 4b8e1891bd Update html_to_markdown.rst 2020-07-05 15:26:05 +02:00
Fabien Potencier f32950c872 Add version in the docs for search engine 2020-06-22 17:25:21 +02:00
Fabien Potencier 054e4c9e3d Merge branch '1.x' into 2.x
* 1.x:
  Add version in the docs to be more search engine friendly
2020-06-22 17:25:11 +02:00
Fabien Potencier 636215f87c Add version in the docs to be more search engine friendly 2020-06-22 17:24:49 +02:00
pgorod 3db903e198 Minimum version fix
I just tried this on Composer
2020-06-17 10:37:50 +01:00
Fabien Potencier 0b19a00138 Merge branch '2.x' into 3.x
* 2.x:
  Fix missing http_build_query function call
  Throw exception in case non-Traversable data is passed to "filter" filter
  Improve batch code example
2020-06-08 12:41:32 +02:00
Fabien Potencier 3beabd64bd Merge branch '1.x' into 2.x
* 1.x:
  Throw exception in case non-Traversable data is passed to "filter" filter
  Improve batch code example
2020-06-08 12:41:25 +02:00
Baptiste Leduc 00dd492bbc Fix missing http_build_query function call 2020-06-03 18:52:35 +02:00
y2keeper feb9321022 Improve batch code example
The current example uses an array of 7 items, resulting in 3 arrays of 3 items each (with fill). 

This can be misinterpreted at a glance as creating n arrays as opposed to arrays with n items.

We should therefore instead use an example array of 4 items resulting in 2 arrays of 3 items each (with fill). 

I think this would make the functionality less ambiguous.
2020-05-25 07:15:25 +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 9810bf558a Drop support for PHP 7.0 2020-05-19 12:19:14 +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 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
Yohann Durand abe625a1a1 Update api.rst 2020-04-24 08:25:17 +02:00
Pierre Grimaud 0273057622 Fix typos 2020-04-24 08:22:30 +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
SpacePossum 628fde13ba [docs] CoreExtension::setEscaper is deprecated 2020-03-30 12:14:13 +02:00
XenoX 6df2e2c318 Remove extra Mardown word in classname 2020-03-27 17:41:01 +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
Christian Flothmann 06ff4bdf9a fix node class namespace 2020-03-24 12:12:57 +01:00
Fabien Potencier 333d86a5ed Merge branch '2.x' into 3.x
* 2.x:
  Tweaking phpdoc above Environment
  Identity Equals - Best practices
  Update default.rst
2020-03-17 15:09:39 +01:00
Fabien Potencier bf64959fb8 Merge branch '1.x' into 2.x
* 1.x:
  Tweaking phpdoc above Environment
  Identity Equals - Best practices
  Update default.rst
2020-03-17 15:09:30 +01:00
Nicolas Sauveur 9ff9a4d3c0 Update default.rst
Add warning for potentially confusing behaviour and alternative solution.
2020-02-26 13:13:20 +01:00
Fabien Potencier 73f5ef2590 Fix CHANGELOG 2020-02-14 16:18:25 +01:00
Fabien Potencier 10e5015411 Merge branch '1.x' into 2.x
* 1.x:
  Fix format of the CHANGELOG
  Update advanced.rst
2020-02-14 16:15:19 +01:00
Abdouni Abdelkarim e030bf6e38 Update advanced.rst
Hello,

I just updated the class name 😉
2020-02-13 13:50:04 +01:00
Fabien Potencier 44638e93a8 Merge branch '2.x' into 3.x
* 2.x:
  Syntax error in doc
2020-01-13 09:20:31 +01:00
Fabien Potencier e52bcf67cf Merge branch '1.x' into 2.x
* 1.x:
  Syntax error in doc
2020-01-13 09:20:25 +01:00
JakeFr fbfac78fbd Syntax error in doc
This code sample in advanced.rst is not highlighted in php because the second semicolon is missing
2020-01-13 08:58:15 +01:00
fancyweb e6d3402c71 Remove versionadded in 2.x in 3.x doc 2020-01-11 12:38:48 +01:00
fancyweb 6b25dccf33 Fix versionadded in doc 2020-01-11 12:21:32 +01:00
Fabien Potencier a6a2c70c42 Merge branch '2.x' into 3.x
* 2.x:
  Minor fixes in docs
2020-01-03 20:00:59 +01:00
Fabien Potencier e770b80203 minor #3235 Minor fixes in docs (l-vo)
This PR was squashed before being merged into the 2.x branch (closes #3235).

Discussion
----------

Minor fixes in docs

Commits
-------

59243e8c Minor fixes in docs
2020-01-03 20:00:30 +01:00
Laurent VOULLEMIER 59243e8ce3 Minor fixes in docs 2020-01-03 20:00:22 +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 e74a51ecb1 Merge branch '1.x' into 2.x
* 1.x:
  Update doc with new escaping behavior
  Remove obsolete page
  language typo
2019-12-28 08:09:20 +01:00
Laurent VOULLEMIER 92e1cd35c5 Update doc with new escaping behavior
When applied on ternary statements
2019-12-27 08:28:48 +01:00
feldenla 8b8cfb0f4e language typo 2019-12-20 13:13:08 +01:00
Fabien Potencier e9f5fff78f Merge branch '1.x' into 3.x
* 1.x:
  Add missing link in docs
  Correct return type of twig_date_converter
2019-12-09 17:39:23 +01:00
Fabien Potencier 46e232b37c Merge branch '1.x' into 2.x
* 1.x:
  Add missing link in docs
  Correct return type of twig_date_converter
2019-12-09 17:39:17 +01:00
Fabien Potencier 335dcad4b0 Add missing link in docs 2019-12-09 17:35:58 +01:00