Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use \Twig_BaseNodeVisitor instead of duplicated visitors code #441

Merged
merged 1 commit into from
Apr 21, 2017
Merged

Use \Twig_BaseNodeVisitor instead of duplicated visitors code #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions DependencyInjection/JMSTranslationExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ public function load(array $configs, ContainerBuilder $container)
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.xml');

if (defined('Twig_Environment::MAJOR_VERSION') && \Twig_Environment::MAJOR_VERSION > 1) {
$loader->load('twig2.xml');
} else {
$loader->load('twig1.xml');
}

$container->setParameter('jms_translation.source_language', $config['source_language']);
$container->setParameter('jms_translation.locales', $config['locales']);

Expand Down
3 changes: 3 additions & 0 deletions Resources/config/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<parameters>
<parameter key="jms_translation.twig_extension.class">JMS\TranslationBundle\Twig\TranslationExtension</parameter>

<parameter key="jms_translation.extractor_manager.class">JMS\TranslationBundle\Translation\ExtractorManager</parameter>
<parameter key="jms_translation.extractor.file_extractor.class">JMS\TranslationBundle\Translation\Extractor\FileExtractor</parameter>
<parameter key="jms_translation.extractor.file.default_php_extractor">JMS\TranslationBundle\Translation\Extractor\File\DefaultPhpFileExtractor</parameter>
<parameter key="jms_translation.extractor.file.translation_container_extractor">JMS\TranslationBundle\Translation\Extractor\File\TranslationContainerExtractor</parameter>
<parameter key="jms_translation.extractor.file.twig_extractor">JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor</parameter>
<parameter key="jms_translation.extractor.file.form_extractor.class">JMS\TranslationBundle\Translation\Extractor\File\FormExtractor</parameter>
<parameter key="jms_translation.extractor.file.validation_extractor.class">JMS\TranslationBundle\Translation\Extractor\File\ValidationExtractor</parameter>
<parameter key="jms_translation.extractor.file.authentication_message_extractor.class">JMS\TranslationBundle\Translation\Extractor\File\AuthenticationMessagesExtractor</parameter>
Expand Down
11 changes: 0 additions & 11 deletions Resources/config/twig1.xml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions Resources/config/twig2.xml
View file
Open in desktop

This file was deleted.

59 changes: 17 additions & 42 deletions Tests/Translation/Extractor/File/TwigFileExtractorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,59 +26,19 @@
use Symfony\Component\Routing\Generator\UrlGenerator;
use Symfony\Bridge\Twig\Extension\RoutingExtension;
use JMS\TranslationBundle\Twig\RemovingNodeVisitor;
use JMS\TranslationBundle\Twig2\RemovingNodeVisitor as Twig2RemovingNodeVisitor;
use JMS\TranslationBundle\Twig\DefaultApplyingNodeVisitor;
use JMS\TranslationBundle\Twig2\DefaultApplyingNodeVisitor as Twig2DefaultApplyingNodeVisitor;
use JMS\TranslationBundle\Exception\RuntimeException;
use Symfony\Component\Translation\MessageSelector;
use Symfony\Component\Translation\IdentityTranslator;
use Symfony\Bridge\Twig\Extension\TranslationExtension as SymfonyTranslationExtension;
use JMS\TranslationBundle\Model\Message;
use JMS\TranslationBundle\Model\MessageCatalogue;
use JMS\TranslationBundle\Twig\TranslationExtension;
use JMS\TranslationBundle\Twig2\TranslationExtension as Twig2TranslationExtension;
use JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor;
use JMS\TranslationBundle\Translation\Extractor\File\Twig2FileExtractor;
use Symfony\Bridge\Twig\Extension\FormExtension;

class TwigFileExtractorTest extends \PHPUnit_Framework_TestCase
{
/** @var \Twig_Environment */
protected $env;

/** @var \JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor */
protected $extractor;

public function setUp()
{
$this->env = new \Twig_Environment(new \Twig_Loader_Array(array()));
$this->env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));

if (defined('Twig_Environment::MAJOR_VERSION') && \Twig_Environment::MAJOR_VERSION > 1) {
$this->env->addExtension(new Twig2TranslationExtension($translator, true));
} else {
$this->env->addExtension(new TranslationExtension($translator, true));
}

$this->env->addExtension(new RoutingExtension(new UrlGenerator(new RouteCollection(), new RequestContext())));
$this->env->addExtension(new FormExtension(new TwigRenderer(new TwigRendererEngine())));

foreach ($this->env->getNodeVisitors() as $visitor) {
if ($visitor instanceof DefaultApplyingNodeVisitor || $visitor instanceof Twig2DefaultApplyingNodeVisitor) {
$visitor->setEnabled(false);
}
if ($visitor instanceof RemovingNodeVisitor || $visitor instanceof Twig2RemovingNodeVisitor) {
$visitor->setEnabled(false);
}
}

if (defined('Twig_Environment::MAJOR_VERSION') && \Twig_Environment::MAJOR_VERSION > 1) {
$this->extractor = new Twig2FileExtractor($this->env, new FileSourceFactory('faux'));
} else {
$this->extractor = new TwigFileExtractor($this->env, new FileSourceFactory('faux'));
}
}

public function testExtractSimpleTemplate()
{
$expected = new MessageCatalogue();
Expand Down Expand Up @@ -183,11 +143,26 @@ private function extract($file, TwigFileExtractor $extractor = null)
throw new RuntimeException(sprintf('The file "%s" does not exist.', $file));
}

$env = new \Twig_Environment(new \Twig_Loader_Array(array()));
$env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));
$env->addExtension(new TranslationExtension($translator, true));
$env->addExtension(new RoutingExtension(new UrlGenerator(new RouteCollection(), new RequestContext())));
$env->addExtension(new FormExtension(new TwigRenderer(new TwigRendererEngine())));

foreach ($env->getNodeVisitors() as $visitor) {
if ($visitor instanceof DefaultApplyingNodeVisitor) {
$visitor->setEnabled(false);
}
if ($visitor instanceof RemovingNodeVisitor) {
$visitor->setEnabled(false);
}
}

if (null === $extractor) {
$extractor = $this->extractor;
$extractor = new TwigFileExtractor($env, new FileSourceFactory('faux'));
}

$ast = $this->env->parse($this->env->tokenize(new \Twig_Source(file_get_contents($file), $file)));
$ast = $env->parse($env->tokenize(new \Twig_Source(file_get_contents($file), $file)));

$catalogue = new MessageCatalogue();
$extractor->visitTwigFile(new \SplFileInfo($file), $catalogue, $ast);
Expand Down
20 changes: 4 additions & 16 deletions Tests/Translation/Extractor/FileExtractorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

namespace JMS\TranslationBundle\Tests\Translation\Extractor;

use JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor;
use JMS\TranslationBundle\Translation\FileSourceFactory;
use JMS\TranslationBundle\Twig\TranslationExtension;
use Psr\Log\NullLogger;
use Doctrine\Common\Annotations\DocParser;
use JMS\TranslationBundle\Translation\Extractor\File\FormExtractor;
Expand All @@ -38,20 +40,6 @@

class FileExtractorTest extends \PHPUnit_Framework_TestCase
{
protected $twigExtractorClass;
protected $translationExtensionClass;

public function setUp()
{
$this->twigExtractorClass = 'JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor';
$this->translationExtensionClass = 'JMS\TranslationBundle\Twig\TranslationExtension';

if (defined('Twig_Environment::MAJOR_VERSION') && \Twig_Environment::MAJOR_VERSION > 1) {
$this->twigExtractorClass = 'JMS\TranslationBundle\Translation\Extractor\File\Twig2FileExtractor';
$this->translationExtensionClass = 'JMS\TranslationBundle\Twig2\TranslationExtension';
}
}

public function testExtractWithSimpleTestFixtures()
{
$expected = array();
Expand Down Expand Up @@ -109,7 +97,7 @@ private function extract($directory)
{
$twig = new \Twig_Environment(new \Twig_Loader_Array(array()));
$twig->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));
$twig->addExtension(new $this->translationExtensionClass($translator));
$twig->addExtension(new TranslationExtension($translator));
$loader=new \Twig_Loader_Filesystem(realpath(__DIR__."/Fixture/SimpleTest/Resources/views/"));
$twig->setLoader($loader);

Expand All @@ -135,7 +123,7 @@ private function extract($directory)
$extractor = new FileExtractor($twig, new NullLogger(), array(
new DefaultPhpFileExtractor($docParser, $dummyFileSourceFactory),
new TranslationContainerExtractor(),
new $this->twigExtractorClass($twig, $dummyFileSourceFactory),
new TwigFileExtractor($twig, $dummyFileSourceFactory),
new ValidationExtractor($factory),
new FormExtractor($docParser, $dummyFileSourceFactory),
));
Expand Down
13 changes: 2 additions & 11 deletions Tests/Twig/BaseTwigTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,17 @@
use Symfony\Component\Translation\MessageSelector;
use Symfony\Component\Translation\IdentityTranslator;
use Symfony\Bridge\Twig\Extension\TranslationExtension as SymfonyTranslationExtension;
use JMS\TranslationBundle\Twig\TranslationExtension;

abstract class BaseTwigTestCase extends \PHPUnit_Framework_TestCase
{
protected $extensionClass;

public function setUp()
{
$this->extensionClass = 'JMS\TranslationBundle\Twig\TranslationExtension';
if (defined('Twig_Environment::MAJOR_VERSION') && \Twig_Environment::MAJOR_VERSION > 1) {
$this->extensionClass = 'JMS\TranslationBundle\Twig2\TranslationExtension';
}
}

final protected function parse($file, $debug = false)
{
$content = file_get_contents(__DIR__.'/Fixture/'.$file);

$env = new \Twig_Environment(new \Twig_Loader_Array(array()));
$env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));
$env->addExtension(new $this->extensionClass($translator, $debug));
$env->addExtension(new TranslationExtension($translator, $debug));

return $env->parse($env->tokenize(new \Twig_Source($content, null)))->getNode('body');
}
Expand Down
Loading