Merge branch '1.x' into 2.x

* 1.x:
  add throws tags doc block for Twig_Environment:load
This commit is contained in:
Fabien Potencier
2017-09-27 11:03:02 -07:00
+4
View File
@@ -309,6 +309,10 @@ class Twig_Environment
*
* @param string|Twig_TemplateWrapper|Twig_Template $name The template name
*
* @throws Twig_Error_Loader When the template cannot be found
* @throws Twig_Error_Runtime When a previously generated cache is corrupted
* @throws Twig_Error_Syntax When an error occurred during compilation
*
* @return Twig_TemplateWrapper
*/
public function load($name)