Commitc89e1e0

committed

reset Twig form theme resources between requests

1 parent7b43f0f commitc89e1e0Copy full SHA for c89e1e0

File tree

+18

-1

lines changed

src/Symfony
- Bundle/TwigBundle/DependencyInjection
  - TwigExtension.php
- Component/Form
  - AbstractRendererEngine.php

+18

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,11 @@`
`18`	`18`	`useSymfony\Component\DependencyInjection\ContainerBuilder;`
`19`	`19`	`useSymfony\Component\DependencyInjection\Loader\XmlFileLoader;`
`20`	`20`	`useSymfony\Component\DependencyInjection\Reference;`
	`21`	`+useSymfony\Component\Form\AbstractRendererEngine;`
`21`	`22`	`useSymfony\Component\HttpKernel\DependencyInjection\Extension;`
`22`	`23`	`useSymfony\Component\Mailer\Mailer;`
`23`	`24`	`useSymfony\Component\Translation\Translator;`
	`25`	`+useSymfony\Contracts\Service\ResetInterface;`
`24`	`26`	`useTwig\Extension\ExtensionInterface;`
`25`	`27`	`useTwig\Extension\RuntimeExtensionInterface;`
`26`	`28`	`useTwig\Loader\LoaderInterface;`
`@@ -40,6 +42,10 @@ public function load(array $configs, ContainerBuilder $container)`
`40`	`42`
`41`	`43`	`if (class_exists(\Symfony\Component\Form\Form::class)) {`
`42`	`44`	`$loader->load('form.xml');`
	`45`	`+`
	`46`	`+if (is_subclass_of(AbstractRendererEngine::class, ResetInterface::class)) {`
	`47`	`+$container->getDefinition('twig.form.engine')->addTag('kernel.reset');`
	`48`	`+ }`
`43`	`49`	`}`
`44`	`50`
`45`	`51`	`if (interface_exists(\Symfony\Component\Templating\EngineInterface::class)) {`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,14 @@`
`11`	`11`
`12`	`12`	`namespaceSymfony\Component\Form;`
`13`	`13`
	`14`	`+useSymfony\Contracts\Service\ResetInterface;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* Default implementation of {@link FormRendererEngineInterface}.`
`16`	`18`	`*`
`17`	`19`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`18`	`20`	`*/`
`19`		`-abstractclass AbstractRendererEngineimplements FormRendererEngineInterface`
	`21`	`+abstractclass AbstractRendererEngineimplements FormRendererEngineInterface, ResetInterface`
`20`	`22`	`{`
`21`	`23`	`/**`
`22`	`24`	`* The variable in {@link FormView} used as cache key.`
`@@ -197,4 +199,13 @@ private function loadResourceForBlockNameHierarchy(string $cacheKey, FormView $v`
`197`	`199`
`198`	`200`	`returnfalse;`
`199`	`201`	`}`
	`202`	`+`
	`203`	`+publicfunctionreset():void`
	`204`	`+ {`
	`205`	`+$this->defaultThemes = [];`
	`206`	`+$this->themes = [];`
	`207`	`+$this->useDefaultThemes = [];`
	`208`	`+$this->resources = [];`
	`209`	`+$this->resourceHierarchyLevels = [];`
	`210`	`+ }`
`200`	`211`	`}`

Comments

(0)