Merge branch '1.x' into 2.x

* 1.x: Add missing link in docs Correct return type of twig_date_converter
twigphp · Dec 9, 2019 · 46e232b · 46e232b
2 parents fdb691a + 335dcad
commit 46e232b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doc/api.rst b/doc/api.rst
@@ -341,8 +341,8 @@ This section describes the features added by the built-in extensions.
 
 .. tip::
 
-    Read the chapter about extending Twig to learn how to create your own
-    extensions.
+    Read the chapter about :doc:`extending Twig <advanced>` to learn how to
+    create your own extensions.
 
 Core Extension
 ~~~~~~~~~~~~~~

diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
@@ -490,7 +490,7 @@ function twig_date_modify_filter(Environment $env, $date, $modifier)
  * @param \DateTimeInterface|string|null  $date     A date or null to use the current time
  * @param \DateTimeZone|string|false|null $timezone The target timezone, null to use the default, false to leave unchanged
  *
- * @return \DateTime
+ * @return \DateTimeInterface
  */
 function twig_date_converter(Environment $env, $date = null, $timezone = null)
 {