geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-27 13:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  simplified code
  use load() instead of loadTemplate() in tests
  added the possibility to pass a TemplateWrapper to Twig\Environment::load()
This commit is contained in:
Fabien Potencier
2019-03-11 19:58:03 +01:00
parent d7ddefe6a2 bebc7a9d5b
commit c91c625f01
13 changed files with 56 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Environment.php
+10 -21
View File
@@ -304,8 +304,8 @@ class Environment
/**
* Renders a template.
*
* @param string $name The template name
* @param array $context An array of parameters to pass to the template
* @param string|TemplateWrapper $name The template name
* @param array $context An array of parameters to pass to the template
*
* @return string The rendered template
*
@@ -315,14 +315,14 @@ class Environment
*/
public function render($name, array $context = [])
{
return $this->loadTemplate($name)->render($context);
return $this->load($name)->render($context);
}
/**
* Displays a template.
*
* @param string $name The template name
* @param array $context An array of parameters to pass to the template
* @param string|TemplateWrapper $name The template name
* @param array $context An array of parameters to pass to the template
*
* @throws LoaderError When the template cannot be found
* @throws SyntaxError When an error occurred during compilation
@@ -330,7 +330,7 @@ class Environment
*/
public function display($name, array $context = [])
{
$this->loadTemplate($name)->display($context);
$this->load($name)->display($context);
}
/**
@@ -480,12 +480,12 @@ class Environment
/**
* Tries to load a template consecutively from an array.
*
* Similar to loadTemplate() but it also accepts instances of \Twig\Template and
* Similar to load() 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
*
* @return Template|TemplateWrapper
* @return TemplateWrapper
*
* @throws LoaderError When none of the templates can be found
* @throws SyntaxError When an error occurred during compilation
@@ -493,24 +493,13 @@ class Environment
public function resolveTemplate($names)
{
if (!\is_array($names)) {
$names = [$names];
return $this->load($names);
}
foreach ($names as $name) {
if ($name instanceof Template) {
return $name;
}
if ($name instanceof TemplateWrapper) {
return $name;
}
try {
return $this->loadTemplate($name);
return $this->load($name);
} catch (LoaderError $e) {
if (1 === \count($names)) {
throw $e;
}
}
}