diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] Fix using "annotations.cached_reader" in after-removing passes

Browse Source
This commit is contained in:
Nicolas Grekas 2018-01-05 13:03:30 +01:00
parent 9419535736
commit f66f9a7b37
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
/** /**
* @internal * @internal
@ -29,14 +28,14 @@ class AddAnnotationsCachedReaderPass implements CompilerPassInterface
// "annotation_reader" at build time don't get any cache // "annotation_reader" at build time don't get any cache
if ($container->hasDefinition('annotations.cached_reader')) { if ($container->hasDefinition('annotations.cached_reader')) {
$reader = $container->getDefinition('annotations.cached_reader'); $reader = $container->getDefinition('annotations.cached_reader');
$tags = $reader->getTags(); $properties = $reader->getProperties();
if (isset($tags['annotations.cached_reader'][0]['provider'])) { if (isset($properties['cacheProviderBackup'])) {
if ($container->hasAlias($provider = $tags['annotations.cached_reader'][0]['provider'])) { $provider = $properties['cacheProviderBackup']->getValues()[0];
$provider = (string) $container->getAlias($provider); unset($properties['cacheProviderBackup']);
} $reader->setProperties($properties);
$container->set('annotations.cached_reader', null); $container->set('annotations.cached_reader', null);
$container->setDefinition('annotations.cached_reader', $reader->replaceArgument(1, new Reference($provider))); $container->setDefinition('annotations.cached_reader', $reader->replaceArgument(1, $provider));
} }
} }
} }

4
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -25,6 +25,7 @@ use Symfony\Component\Config\ResourceCheckerInterface;
use Symfony\Component\Console\Application; use Symfony\Component\Console\Application;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use Symfony\Component\DependencyInjection\ChildDefinition; use Symfony\Component\DependencyInjection\ChildDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
@ -1131,7 +1132,8 @@ class FrameworkExtension extends Extension
$container $container
->getDefinition('annotations.cached_reader') ->getDefinition('annotations.cached_reader')
->replaceArgument(2, $config['debug']) ->replaceArgument(2, $config['debug'])
->addTag('annotations.cached_reader', array('provider' => $cacheService)) // temporary property to lazy-reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
->setProperty('cacheProviderBackup', new ServiceClosureArgument(new Reference($cacheService)))
; ;
$container->setAlias('annotation_reader', 'annotations.cached_reader'); $container->setAlias('annotation_reader', 'annotations.cached_reader');
$container->setAlias(Reader::class, new Alias('annotations.cached_reader', false)); $container->setAlias(Reader::class, new Alias('annotations.cached_reader', false));

2
src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
View File

@ -91,7 +91,7 @@ class FrameworkBundle extends Bundle
$container->addCompilerPass(new RegisterListenersPass(), PassConfig::TYPE_BEFORE_REMOVING); $container->addCompilerPass(new RegisterListenersPass(), PassConfig::TYPE_BEFORE_REMOVING);
$container->addCompilerPass(new TemplatingPass()); $container->addCompilerPass(new TemplatingPass());
$this->addCompilerPassIfExists($container, AddConstraintValidatorsPass::class, PassConfig::TYPE_BEFORE_REMOVING); $this->addCompilerPassIfExists($container, AddConstraintValidatorsPass::class, PassConfig::TYPE_BEFORE_REMOVING);
$container->addCompilerPass(new AddAnnotationsCachedReaderPass(), PassConfig::TYPE_BEFORE_REMOVING); $container->addCompilerPass(new AddAnnotationsCachedReaderPass(), PassConfig::TYPE_AFTER_REMOVING, -255);
$this->addCompilerPassIfExists($container, AddValidatorInitializersPass::class); $this->addCompilerPassIfExists($container, AddValidatorInitializersPass::class);
$this->addCompilerPassIfExists($container, AddConsoleCommandPass::class); $this->addCompilerPassIfExists($container, AddConsoleCommandPass::class);
$container->addCompilerPass(new TranslatorPass()); $container->addCompilerPass(new TranslatorPass());

3
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
View File

@ -12,6 +12,7 @@
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle; namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle; use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\DependencyInjection\Compiler\PassConfig;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\AnnotationReaderPass; use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\AnnotationReaderPass;
use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\Config\CustomConfig; use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\Config\CustomConfig;
@ -27,6 +28,6 @@ class TestBundle extends Bundle
$extension->setCustomConfig(new CustomConfig()); $extension->setCustomConfig(new CustomConfig());
$container->addCompilerPass(new AnnotationReaderPass()); $container->addCompilerPass(new AnnotationReaderPass(), PassConfig::TYPE_AFTER_REMOVING);
} }
} }