[TwigBundle] move deprecation notice for the twig.form.resources configuration key in the TwigExtension class.

Hugo Hamon · Hugo Hamon · commit 7f8f81ecb66e · 2015-01-09T17:13:48.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -54,8 +54,6 @@ private function addFormSection(ArrayNodeDefinition $rootNode)
                     return count($v['form']['resources']) > 0;
                 })
                 ->then(function ($v) {
-                    trigger_error('The twig.form.resources configuration key is deprecated since version 2.6 and will be removed in 3.0. Use the twig.form_themes configuration key instead.', E_USER_DEPRECATED);
-
                     $v['form_themes'] = array_values(array_unique(array_merge($v['form']['resources'], $v['form_themes'])));
 
                     return $v;
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -33,6 +33,12 @@ class TwigExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
+        // Check deprecation before the config is processed to ensure
+        // the settings has been explicitly defined in a configuration file.
+        if (isset($configs['form']['resources'])) {
+            trigger_error('The twig.form.resources configuration key is deprecated since version 2.6 and will be removed in 3.0. Use the twig.form_themes configuration key instead.', E_USER_DEPRECATED);
+        }
+
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('twig.xml');
 
