Skip to content

Force load translator since templating is enabled with php engine #21374

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

Closed
wants to merge 2 commits into from
Closed

Force load translator since templating is enabled with php engine #21374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb17221
force load translator since templating is enabled with php engine
inelgnu Jan 22, 2017
144c9c9
use ::class syntaxt instead of string
inelgnu Jan 25, 2017
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
14 changes: 10 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
use Symfony\Component\Translation\Translator;
use Symfony\Component\Workflow;
use Symfony\Component\Workflow\SupportStrategy\ClassInstanceSupportStrategy;
use Symfony\Component\Yaml\Yaml;
Expand Down Expand Up @@ -93,23 +94,28 @@ public function load(array $configs, ContainerBuilder $container)
$config = $this->processConfiguration($configuration, $configs);

$this->annotationsConfigEnabled = $this->isConfigEnabled($container, $config['annotations']);
$isTemplatingPHPEngineEnabled = $this->isConfigEnabled($container, $config['templating']) && in_array('php', $config['templating']['engines']);

// A translator must always be registered (as support is included by
// default in the Form and Validator component). If disabled, an identity
// translator will be used and everything will still work as expected.
if ($this->isConfigEnabled($container, $config['translator']) || $this->isConfigEnabled($container, $config['form']) || $this->isConfigEnabled($container, $config['validation'])) {
if (!class_exists('Symfony\Component\Translation\Translator') && $this->isConfigEnabled($container, $config['translator'])) {
if ($this->isConfigEnabled($container, $config['translator']) || $this->isConfigEnabled($container, $config['form']) || $this->isConfigEnabled($container, $config['validation']) || $isTemplatingPHPEngineEnabled) {
if (!class_exists(Translator::class) && $this->isConfigEnabled($container, $config['translator'])) {
throw new LogicException('Translation support cannot be enabled as the Translation component is not installed.');
}

if (!class_exists('Symfony\Component\Translation\Translator') && $this->isConfigEnabled($container, $config['form'])) {
if (!class_exists(Translator::class) && $this->isConfigEnabled($container, $config['form'])) {
throw new LogicException('Form support cannot be enabled as the Translation component is not installed.');
}

if (!class_exists('Symfony\Component\Translation\Translator') && $this->isConfigEnabled($container, $config['validation'])) {
if (!class_exists(Translator::class) && $this->isConfigEnabled($container, $config['validation'])) {
throw new LogicException('Validation support cannot be enabled as the Translation component is not installed.');
}

if (!class_exists(Translator::class) && $isTemplatingPHPEngineEnabled) {
throw new LogicException('Templating with PHP engine support cannot be enabled as the Translation component is not installed.');
}

$loader->load('identity_translator.xml');
}

Expand Down
7 changes: 7 additions & 0 deletions .../Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_enabled_php.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

$container->loadFromExtension('framework', array(
'templating' => array(
'engines' => array('php'),
),
));
13 changes: 13 additions & 0 deletions .../Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_enabled_php.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:templating>
<framework:engine>php</framework:engine>
</framework:templating>
</framework:config>
</container>
3 changes: 3 additions & 0 deletions .../Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/templating_enabled_php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
framework:
templating:
engines: [php]
7 changes: 7 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ abstract class FrameworkExtensionTest extends TestCase

abstract protected function loadFromFile(ContainerBuilder $container, $file);

public function testTranslationEnabledWhenTemplatingEngineIsSetToPHP()
{
$container = $this->createContainerFromFile('templating_enabled_php');

$this->assertTrue($container->has('translator'));
}

public function testFormCsrfProtection()
{
$container = $this->createContainerFromFile('full');
Expand Down