mirror of
https://github.com/twigphp/Twig.git
synced 2026-08-31 12:37:15 +00:00
Fix bad merge
This commit is contained in:
+1
-1
@@ -124,7 +124,7 @@ class Error extends \Exception
|
||||
}
|
||||
|
||||
if ($this->source && $this->source->getName()) {
|
||||
$this->message .= \sprintf(' in %s', $this->source->getName());
|
||||
$this->message .= \sprintf(' in "%s"', $this->source->getName());
|
||||
}
|
||||
|
||||
if ($this->lineno && $this->lineno >= 0) {
|
||||
|
||||
@@ -14,9 +14,10 @@ namespace Twig\Node\Expression\Variable;
|
||||
use Twig\Compiler;
|
||||
use Twig\Node\Expression\AbstractExpression;
|
||||
use Twig\Node\Expression\SupportDefinedTestDeprecationTrait;
|
||||
use Twig\Node\Expression\SupportDefinedTestInterface;
|
||||
use Twig\Node\Expression\SupportDefinedTestTrait;
|
||||
|
||||
class ContextVariable extends AbstractExpression
|
||||
class ContextVariable extends AbstractExpression implements SupportDefinedTestInterface
|
||||
{
|
||||
use SupportDefinedTestDeprecationTrait;
|
||||
use SupportDefinedTestTrait;
|
||||
|
||||
Reference in New Issue
Block a user