Browse code
Merge branch '1.x' into 2.x
* 1.x:
Add missing link in docs
Correct return type of twig_date_converter
Fabien Potencier authored on 09/12/2019 16:39:17
Showing 2 changed files
| ... | ... |
@@ -341,8 +341,8 @@ This section describes the features added by the built-in extensions. |
| 341 | 341 |
|
| 342 | 342 |
.. tip:: |
| 343 | 343 |
|
| 344 |
- Read the chapter about extending Twig to learn how to create your own |
|
| 345 |
- extensions. |
|
| 344 |
+ Read the chapter about :doc:`extending Twig <advanced>` to learn how to |
|
| 345 |
+ create your own extensions. |
|
| 346 | 346 |
|
| 347 | 347 |
Core Extension |
| 348 | 348 |
~~~~~~~~~~~~~~ |
| ... | ... |
@@ -490,7 +490,7 @@ function twig_date_modify_filter(Environment $env, $date, $modifier) |
| 490 | 490 |
* @param \DateTimeInterface|string|null $date A date or null to use the current time |
| 491 | 491 |
* @param \DateTimeZone|string|false|null $timezone The target timezone, null to use the default, false to leave unchanged |
| 492 | 492 |
* |
| 493 |
- * @return \DateTime |
|
| 493 |
+ * @return \DateTimeInterface |
|
| 494 | 494 |
*/ |
| 495 | 495 |
function twig_date_converter(Environment $env, $date = null, $timezone = null) |
| 496 | 496 |
{
|