This commit is contained in:
Cyprian Beauvois 2019-02-19 12:29:31 +01:00
parent 7fef885687
commit dac3090138
3 changed files with 69 additions and 16 deletions

View File

@ -0,0 +1,66 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Validator\DependencyInjection;
use Symfony\Component\DependencyInjection\ChildDefinition;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Component\Validator\Util\LegacyTranslatorProxy;
/**
* @author Fabien Potencier <fabien@symfony.com>
* @author Robin Chalas <robin.chalas@gmail.com>
*/
class AddValidatorInitializersPass implements CompilerPassInterface
{
private $builderService;
private $initializerTag;
public function __construct(string $builderService = 'validator.builder', string $initializerTag = 'validator.initializer')
{
$this->builderService = $builderService;
$this->initializerTag = $initializerTag;
}
public function process(ContainerBuilder $container)
{
if (!$container->hasDefinition($this->builderService)) {
return;
}
$initializers = [];
foreach ($container->findTaggedServiceIds($this->initializerTag, true) as $id => $attributes) {
$initializers[] = new Reference($id);
}
$container->getDefinition($this->builderService)->addMethodCall('addObjectInitializers', [$initializers]);
// @deprecated logic, to be removed in Symfony 5.0
$builder = $container->getDefinition($this->builderService);
$calls = [];
foreach ($builder->getMethodCalls() as list($method, $arguments)) {
if ('setTranslator' === $method) {
if (!$arguments[0] instanceof Reference) {
$translator = $arguments[0];
} elseif ($container->has($arguments[0])) {
$translator = $container->findDefinition($arguments[0]);
} else {
continue;
}
while (!($class = $translator->getClass()) && $translator instanceof ChildDefinition) {
$translator = $translator->getParent();
}
if (!is_subclass_of($class, LegacyTranslatorInterface::class)) {
$arguments[0] = (new Definition(LegacyTranslatorProxy::class))->addArgument($arguments[0]);
}
}
$calls[] = [$method, $arguments];
}
$builder->setMethodCalls($calls);
}
}

View File

@ -3,3 +3,4 @@ services:
autowire: true
autoconfigure: true
public: false
tags: ['controller.service_arguments']

View File

@ -2,16 +2,13 @@
namespace Bluesquare;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\Config\FileLocator;
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Contracts\Translation\TranslatorInterface;
use Traversable;
class ValidatorBundle extends Extension
class ValidatorBundle extends Bundle
{
protected $request;
protected $context;
@ -444,15 +441,4 @@ class ValidatorBundle extends Extension
$words = array_map('ucfirst', explode('_', $string));
return implode('', $words);
}
/**
* Loads a specific configuration.
*
* @throws \InvalidArgumentException When provided tag is not defined in this extension
*/
public function load(array $configs, ContainerBuilder $container)
{
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '../Ressources/config'));
$loader->load('services.yaml');
}
}