Merge branch '5.1' into 5.x

javiereguiluz · javiereguiluz · commit 8b678b620551 · 2020-11-12T10:22:34.000+01:00
* 5.1:
  Throw Exception if twig variable is not found
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -358,6 +358,8 @@ the directory defined in the :ref:`default_path option <config-twig-default-path
 
 Read more about :ref:`template directories and namespaces <templates-namespaces>`.
 
+.. _config-twig-strict-variables:
+
 strict_variables
 ~~~~~~~~~~~~~~~~
 
diff --git a/templates.rst b/templates.rst
@@ -164,7 +164,9 @@ in the following order:
 #. ``$foo->getBar()`` (object and *getter* method);
 #. ``$foo->isBar()`` (object and *isser* method);
 #. ``$foo->hasBar()`` (object and *hasser* method);
-#. If none of the above exists, use ``null``.
+#. If none of the above exists, use ``null`` (or throw a ``Twig\Error\RuntimeError``
+   exception if the :ref:`strict_variables <config-twig-strict-variables>`
+   option is enabled).
 
 This allows to evolve your application code without having to change the
 template code (you can start with array variables for the application proof of
