Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit ce14399e0921 · 2017-10-20T12:28:39.000-07:00
* 3.4: (26 commits) [Routing] Fix resource miss [Security] Fixed auth provider authenticate() cannot return void [FrameworkBundle][Serializer] Move DateIntervalNormalizer definition to xml declare argument type Improving annotation loader message [FrameworkBundle][Serializer] Move normalizer/encoders definitions to xml file & remove unnecessary checks Update UPGRADE-4.0.md streamed response should return $this $isClientIpsVali is not used [WebServerBundle] Prevent commands from being registered by convention content can be a resource Adding the Form default theme files to be warmed up in Twig's cache Remove BC Break label from `NullDumper` class Username and password in basic auth are allowed to contain '.' Remove obsolete PHPDoc from UriSigner [Serializer] YamlEncoder: throw if the Yaml component isn't installed [Serializer] ObjectNormalizer: throw if PropertyAccess isn't installed [PropertyInfo] Add support for the iterable type pdo session fix Fixed pathinfo calculation for requests starting with a question mark. - fix bad conflict resolving issue - port symfony/symfony#21968 to 3.3+ ...
diff --git a/DependencyInjection/Compiler/ExtensionPass.php b/DependencyInjection/Compiler/ExtensionPass.php
@@ -43,7 +43,14 @@ public function process(ContainerBuilder $container)
         if ($container->has('form.extension')) {
             $container->getDefinition('twig.extension.form')->addTag('twig.extension');
             $reflClass = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension');
-            $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
+
+            $coreThemePath = dirname(dirname($reflClass->getFileName())).'/Resources/views/Form';
+            $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', array($coreThemePath));
+
+            $paths = $container->getDefinition('twig.cache_warmer')->getArgument(2);
+            $paths[$coreThemePath] = null;
+            $container->getDefinition('twig.cache_warmer')->replaceArgument(2, $paths);
+            $container->getDefinition('twig.template_iterator')->replaceArgument(2, $paths);
         }
 
         if ($container->has('router')) {
diff --git a/DependencyInjection/TwigExtension.php b/DependencyInjection/TwigExtension.php
@@ -106,6 +106,7 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
+        // paths are modified in ExtensionPass if forms are enabled
         $container->getDefinition('twig.cache_warmer')->replaceArgument(2, $config['paths']);
         $container->getDefinition('twig.template_iterator')->replaceArgument(2, $config['paths']);
 

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ public function load(array $configs, ContainerBuilder $container)`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ // paths are modified in ExtensionPass if forms are enabled`
`109`	`110`	`$container->getDefinition('twig.cache_warmer')->replaceArgument(2, $config['paths']);`
`110`	`111`	`$container->getDefinition('twig.template_iterator')->replaceArgument(2, $config['paths']);`
`111`	`112`