diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
index 82d72983657ba..28932d9449d6a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -16,7 +16,6 @@
use Symfony\Bridge\Twig\Translation\TwigExtractor;
use Symfony\Component\Translation\MessageCatalogue;
use Twig\Environment;
-use Twig\Error\Error;
use Twig\Loader\ArrayLoader;
class TwigExtractorTest extends TestCase
@@ -78,23 +77,15 @@ public function getExtractData()
/**
* @dataProvider resourcesWithSyntaxErrorsProvider
*/
- public function testExtractSyntaxError($resources)
+ public function testExtractSyntaxError($resources, array $messages)
{
- $this->expectException('Twig\Error\Error');
$twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
$twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
$extractor = new TwigExtractor($twig);
-
- try {
- $extractor->extract($resources, new MessageCatalogue('en'));
- } catch (Error $e) {
- $this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', \DIRECTORY_SEPARATOR), $e->getFile());
- $this->assertSame(1, $e->getLine());
- $this->assertSame('Unclosed "block".', $e->getMessage());
-
- throw $e;
- }
+ $catalogue = new MessageCatalogue('en');
+ $extractor->extract($resources, $catalogue);
+ $this->assertSame($messages, $catalogue->all());
}
/**
@@ -103,9 +94,9 @@ public function testExtractSyntaxError($resources)
public function resourcesWithSyntaxErrorsProvider()
{
return [
- [__DIR__.'/../Fixtures'],
- [__DIR__.'/../Fixtures/extractor/syntax_error.twig'],
- [new \SplFileInfo(__DIR__.'/../Fixtures/extractor/syntax_error.twig')],
+ [__DIR__.'/../Fixtures', ['messages' => ['Hi!' => 'Hi!']]],
+ [__DIR__.'/../Fixtures/extractor/syntax_error.twig', []],
+ [new \SplFileInfo(__DIR__.'/../Fixtures/extractor/syntax_error.twig'), []],
];
}
diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
index b7c787226656f..107d8cc4bff17 100644
--- a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
+++ b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -12,7 +12,6 @@
namespace Symfony\Bridge\Twig\Translation;
use Symfony\Component\Finder\Finder;
-use Symfony\Component\Finder\SplFileInfo;
use Symfony\Component\Translation\Extractor\AbstractFileExtractor;
use Symfony\Component\Translation\Extractor\ExtractorInterface;
use Symfony\Component\Translation\MessageCatalogue;
@@ -58,13 +57,7 @@ public function extract($resource, MessageCatalogue $catalogue)
try {
$this->extractTemplate(file_get_contents($file->getPathname()), $catalogue);
} catch (Error $e) {
- if ($file instanceof \SplFileInfo) {
- $path = $file->getRealPath() ?: $file->getPathname();
- $name = $file instanceof SplFileInfo ? $file->getRelativePathname() : $path;
- $e->setSourceContext(new Source('', $name, $path));
- }
-
- throw $e;
+ // ignore errors, these should be fixed by using the linter
}
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy