Merge branch '1.x' into 2.x

* 1.x:
  fixed more un-namespaced classes
This commit is contained in:
Fabien Potencier
2019-03-06 18:10:47 +01:00
2 changed files with 5 additions and 5 deletions
+4 -4
View File
@@ -78,10 +78,10 @@ class Environment
* * charset: The charset used by the templates (default to UTF-8).
*
* * base_template_class: The base template class to use for generated
* templates (default to \Twig_Template).
* templates (default to \Twig\Template).
*
* * cache: An absolute path where to store the compiled templates,
* a \Twig_Cache_Interface implementation,
* a \Twig\Cache\CacheInterface implementation,
* or false to disable compilation cache (default).
*
* * auto_reload: Whether to reload the template if the original source changed.
@@ -482,8 +482,8 @@ class Environment
/**
* Tries to load a template consecutively from an array.
*
* Similar to loadTemplate() but it also accepts instances of \Twig_Template and
* \Twig_TemplateWrapper, and an array of templates where each is tried to be loaded.
* Similar to loadTemplate() but it also accepts instances of \Twig\Template and
* \Twig\TemplateWrapper, and an array of templates where each is tried to be loaded.
*
* @param string|Template|TemplateWrapper|array $names A template or an array of templates to try consecutively
*
+1 -1
View File
@@ -15,7 +15,7 @@ use Twig\Environment;
use Twig\Node\Node;
/**
* \Twig_NodeVisitorInterface is the interface the all node visitor classes must implement.
* Interface for node visitor classes.
*
* @author Fabien Potencier <fabien@symfony.com>
*/