[FrameworkBundle][TwigBundle] Adapted bundle references to latest symfony/master changes

src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml

@@ -14,8 +14,8 @@
         <parameter key="form.theme.factory.twig.class">Symfony\Component\Form\Renderer\Theme\TwigThemeFactory</parameter>
         <parameter key="form.theme.factory.php.class">Symfony\Component\Form\Renderer\Theme\PhpThemeFactory</parameter>
         <parameter key="form.theme.factory.phpengine.class">Symfony\Bundle\FrameworkBundle\Form\PhpEngineThemeFactory</parameter>
-        <parameter key="form.theme.template.twig">TwigBundle::div_layout.html.twig</parameter>
-        <parameter key="form.theme.template.phpengine">FrameworkBundle:Form</parameter>
+        <parameter key="form.theme.template.twig">Twig::div_layout.html.twig</parameter>
+        <parameter key="form.theme.template.phpengine">Framework:Form</parameter>
         <parameter key="form.factory.class">Symfony\Component\Form\FormFactory</parameter>
         <parameter key="form.csrf_protection.enabled">true</parameter>
         <parameter key="form.csrf_protection.field_name">_token</parameter>

src/Symfony/Bundle/TwigBundle/Resources/views/div_layout.html.twig

@@ -1,4 +1,4 @@
-{% extends "TwigBundle::widgets.html.twig" %}
+{% extends "Twig::widgets.html.twig" %}
 
 {% block field__row %}
 {% spaceless %}

src/Symfony/Bundle/TwigBundle/Resources/views/table_layout.html.twig

@@ -1,4 +1,4 @@
-{% extends "TwigBundle::widgets.html.twig" %}
+{% extends "Twig::widgets.html.twig" %}
 
 {% block field__row %}
 {% spaceless %}