Skip to content

Commit 395a0b8

Browse files
committed
[Twig] Remove dead code
1 parent f614e22 commit 395a0b8

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

Tests/TokenParser/FormThemeTokenParserTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ public function testCompile($source, $expected)
3434
$stream = $env->tokenize($source);
3535
$parser = new Parser($env);
3636

37-
if (method_exists($expected, 'setSourceContext')) {
38-
$expected->setSourceContext($source);
39-
}
37+
$expected->setSourceContext($source);
4038

4139
$this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));
4240
}

Tests/Translation/TwigExtractorTest.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,10 @@ public function testExtractSyntaxError($resources)
8989
try {
9090
$extractor->extract($resources, new MessageCatalogue('en'));
9191
} catch (Error $e) {
92-
if (method_exists($e, 'getSourceContext')) {
93-
$this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', \DIRECTORY_SEPARATOR), $e->getFile());
94-
$this->assertSame(1, $e->getLine());
95-
$this->assertSame('Unclosed "block".', $e->getMessage());
96-
} else {
97-
$this->expectExceptionMessageRegExp('/Unclosed "block" in ".*extractor(\\/|\\\\)syntax_error\\.twig" at line 1/');
98-
}
92+
$this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', \DIRECTORY_SEPARATOR), $e->getFile());
93+
$this->assertSame(1, $e->getLine());
94+
$this->assertSame('Unclosed "block".', $e->getMessage());
95+
9996
throw $e;
10097
}
10198
}

Translation/TwigExtractor.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ public function extract($resource, MessageCatalogue $catalogue)
6161
if ($file instanceof \SplFileInfo) {
6262
$path = $file->getRealPath() ?: $file->getPathname();
6363
$name = $file instanceof SplFileInfo ? $file->getRelativePathname() : $path;
64-
if (method_exists($e, 'setSourceContext')) {
65-
$e->setSourceContext(new Source('', $name, $path));
66-
} else {
67-
$e->setTemplateName($name);
68-
}
64+
$e->setSourceContext(new Source('', $name, $path));
6965
}
7066

7167
throw $e;

0 commit comments

Comments
 (0)