Cleanup
This commit is contained in:
parent
9a6e727222
commit
bde30e2308
@ -42,11 +42,6 @@ class ExtensionPass implements CompilerPassInterface
|
|||||||
$viewDir = \dirname((new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension'))->getFileName(), 2).'/Resources/views';
|
$viewDir = \dirname((new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension'))->getFileName(), 2).'/Resources/views';
|
||||||
$templateIterator = $container->getDefinition('twig.template_iterator');
|
$templateIterator = $container->getDefinition('twig.template_iterator');
|
||||||
$templatePaths = $templateIterator->getArgument(1);
|
$templatePaths = $templateIterator->getArgument(1);
|
||||||
$cacheWarmer = null;
|
|
||||||
if ($container->hasDefinition('twig.cache_warmer')) {
|
|
||||||
$cacheWarmer = $container->getDefinition('twig.cache_warmer');
|
|
||||||
$cacheWarmerPaths = $cacheWarmer->getArgument(2);
|
|
||||||
}
|
|
||||||
$loader = $container->getDefinition('twig.loader.native_filesystem');
|
$loader = $container->getDefinition('twig.loader.native_filesystem');
|
||||||
|
|
||||||
if ($container->has('mailer')) {
|
if ($container->has('mailer')) {
|
||||||
@ -54,9 +49,6 @@ class ExtensionPass implements CompilerPassInterface
|
|||||||
$loader->addMethodCall('addPath', [$emailPath, 'email']);
|
$loader->addMethodCall('addPath', [$emailPath, 'email']);
|
||||||
$loader->addMethodCall('addPath', [$emailPath, '!email']);
|
$loader->addMethodCall('addPath', [$emailPath, '!email']);
|
||||||
$templatePaths[$emailPath] = 'email';
|
$templatePaths[$emailPath] = 'email';
|
||||||
if ($cacheWarmer) {
|
|
||||||
$cacheWarmerPaths[$emailPath] = 'email';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($container->has('form.extension')) {
|
if ($container->has('form.extension')) {
|
||||||
@ -65,15 +57,9 @@ class ExtensionPass implements CompilerPassInterface
|
|||||||
$coreThemePath = $viewDir.'/Form';
|
$coreThemePath = $viewDir.'/Form';
|
||||||
$loader->addMethodCall('addPath', [$coreThemePath]);
|
$loader->addMethodCall('addPath', [$coreThemePath]);
|
||||||
$templatePaths[$coreThemePath] = null;
|
$templatePaths[$coreThemePath] = null;
|
||||||
if ($cacheWarmer) {
|
|
||||||
$cacheWarmerPaths[$coreThemePath] = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$templateIterator->replaceArgument(1, $templatePaths);
|
$templateIterator->replaceArgument(1, $templatePaths);
|
||||||
if ($cacheWarmer) {
|
|
||||||
$container->getDefinition('twig.cache_warmer')->replaceArgument(2, $cacheWarmerPaths);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($container->has('router')) {
|
if ($container->has('router')) {
|
||||||
$container->getDefinition('twig.extension.routing')->addTag('twig.extension');
|
$container->getDefinition('twig.extension.routing')->addTag('twig.extension');
|
||||||
@ -90,10 +76,6 @@ class ExtensionPass implements CompilerPassInterface
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$container->has('http_kernel')) {
|
|
||||||
$container->removeDefinition('twig.controller.preview_error');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($container->has('request_stack')) {
|
if ($container->has('request_stack')) {
|
||||||
$container->getDefinition('twig.extension.httpfoundation')->addTag('twig.extension');
|
$container->getDefinition('twig.extension.httpfoundation')->addTag('twig.extension');
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user