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

Simplify Error implementation

Browse Source
This commit is contained in:
Fabien Potencier
2025-02-21 11:00:21 +01:00
parent cfeb51b67f
commit d10bcadd75
1 changed files with 17 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Error/Error.php
+17 -43
View File
@@ -39,10 +39,8 @@ use Twig\Template;
class Error extends \Exception
{
private $lineno;
private $name;
private $rawMessage;
private $sourcePath;
private $sourceCode;
private ?Source $source;
/**
* Constructor.
@@ -57,16 +55,8 @@ class Error extends \Exception
{
parent::__construct('', 0, $previous);
if (null === $source) {
$name = null;
} else {
$name = $source->getName();
$this->sourceCode = $source->getCode();
$this->sourcePath = $source->getPath();
}
$this->lineno = $lineno;
$this->name = $name;
$this->source = $source;
$this->rawMessage = $message;
$this->updateRepr();
}
@@ -84,25 +74,17 @@ class Error extends \Exception
public function setTemplateLine(int $lineno): void
{
$this->lineno = $lineno;
$this->updateRepr();
}
public function getSourceContext(): ?Source
{
return $this->name ? new Source($this->sourceCode, $this->name, $this->sourcePath) : null;
return $this->source;
}
public function setSourceContext(?Source $source = null): void
{
if (null === $source) {
$this->sourceCode = $this->name = $this->sourcePath = null;
} else {
$this->sourceCode = $source->getCode();
$this->name = $source->getName();
$this->sourcePath = $source->getPath();
}
$this->source = $source;
$this->updateRepr();
}
@@ -122,8 +104,8 @@ class Error extends \Exception
{
$this->message = $this->rawMessage;
if ($this->sourcePath && $this->lineno > 0) {
$this->file = $this->sourcePath;
if ($this->source && $this->source->getPath() && $this->lineno > 0) {
$this->file = $this->source->getPath();
$this->line = $this->lineno;
return;
@@ -141,11 +123,12 @@ class Error extends \Exception
$questionMark = true;
}
if ($this->name) {
if (\is_string($this->name) || $this->name instanceof \Stringable) {
$name = \sprintf('"%s"', $this->name);
if ($this->source && $this->source->getName()) {
$name = $this->source->getName();
if (\is_string($name) || $name instanceof \Stringable) {
$name = \sprintf('"%s"', $name);
} else {
$name = json_encode($this->name);
$name = json_encode($name);
}
$this->message .= \sprintf(' in %s', $name);
}
@@ -165,34 +148,25 @@ class Error extends \Exception
private function guessTemplateInfo(): void
{
// $this->source is never null here (see guess() usage in Template)
$template = null;
$templateClass = null;
$backtrace = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS | \DEBUG_BACKTRACE_PROVIDE_OBJECT);
foreach ($backtrace as $trace) {
if (isset($trace['object']) && $trace['object'] instanceof Template) {
$currentClass = \get_class($trace['object']);
$isEmbedContainer = null === $templateClass ? false : str_starts_with($templateClass, $currentClass);
if (null === $this->name || ($this->name == $trace['object']->getTemplateName() && !$isEmbedContainer)) {
if ($this->source->getName() === $trace['object']->getTemplateName() && !$isEmbedContainer) {
$template = $trace['object'];
$templateClass = \get_class($trace['object']);
}
}
}
// update template name
if (null !== $template && null === $this->name) {
$this->name = $template->getTemplateName();
}
// update template path if any
if (null !== $template && null === $this->sourcePath) {
$src = $template->getSourceContext();
$this->sourceCode = $src->getCode();
$this->sourcePath = $src->getPath();
}
if (null === $template || $this->lineno > -1) {
if ($template) {
$this->source = $template->getSourceContext();
} elseif ($this->lineno > -1) {
return;
}