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

merged branch ShadowPrince/master (PR #1042)

Browse Source 
This PR was squashed before being merged into the master branch (closes #1042).

Discussion
----------

Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error

Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error:

$environment->addFunction(new Twig_SimpleFunction(...))
after 
$environment->render(...)
throws Fatal Error: 
object of Twig_SimpleFunction could not be converted to string

Commits
-------

92e97b9 Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
This commit is contained in:
Fabien Potencier
2013-04-01 10:26:39 +02:00
parent e8991cc2f9 92e97b9d90
commit 296bae96e7
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Environment.php
+14 -14
View File
@@ -756,10 +756,6 @@ class Twig_Environment
*/
public function addFilter($name, $filter = null)
{
if ($this->extensionInitialized) {
throw new LogicException(sprintf('Unable to add filter "%s" as extensions have already been initialized.', $name));
}
if (!$name instanceof Twig_SimpleFilter && !($filter instanceof Twig_SimpleFilter || $filter instanceof Twig_FilterInterface)) {
throw new LogicException('A filter must be an instance of Twig_FilterInterface or Twig_SimpleFilter');
}
@@ -768,7 +764,11 @@ class Twig_Environment
$filter = $name;
$name = $filter->getName();
}
if ($this->extensionInitialized) {
throw new LogicException(sprintf('Unable to add filter "%s" as extensions have already been initialized.', $name));
}
$this->staging->addFilter($name, $filter);
}
@@ -845,10 +845,6 @@ class Twig_Environment
*/
public function addTest($name, $test = null)
{
if ($this->extensionInitialized) {
throw new LogicException(sprintf('Unable to add test "%s" as extensions have already been initialized.', $name));
}
if (!$name instanceof Twig_SimpleTest && !($test instanceof Twig_SimpleTest || $test instanceof Twig_TestInterface)) {
throw new LogicException('A test must be an instance of Twig_TestInterface or Twig_SimpleTest');
}
@@ -857,6 +853,10 @@ class Twig_Environment
$test = $name;
$name = $test->getName();
}
if ($this->extensionInitialized) {
throw new LogicException(sprintf('Unable to add test "%s" as extensions have already been initialized.', $name));
}
$this->staging->addTest($name, $test);
}
@@ -903,10 +903,6 @@ class Twig_Environment
*/
public function addFunction($name, $function = null)
{
if ($this->extensionInitialized) {
throw new LogicException(sprintf('Unable to add function "%s" as extensions have already been initialized.', $name));
}
if (!$name instanceof Twig_SimpleFunction && !($function instanceof Twig_SimpleFunction || $function instanceof Twig_FunctionInterface)) {
throw new LogicException('A function must be an instance of Twig_FunctionInterface or Twig_SimpleFunction');
}
@@ -915,7 +911,11 @@ class Twig_Environment
$function = $name;
$name = $function->getName();
}
if ($this->extensionInitialized) {
throw new LogicException(sprintf('Unable to add function "%s" as extensions have already been initialized.', $name));
}
$this->staging->addFunction($name, $function);
}