Merge remote branch 'johnwards/experimental' into johnwards-merge

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

@@ -3,9 +3,9 @@
 {% block row %}
 {% spaceless %}
     <div>
-        {{ this.label }}
-        {{ this.errors }}
-        {{ this.widget }}
+        {{ renderer.label }}
+        {{ renderer.errors }}
+        {{ renderer.widget }}
     </div>
 {% endspaceless %}
 {% endblock row %}
@@ -13,6 +13,6 @@
 {% block form__widget %}
 {% spaceless %}
     {{ block('rows') }}
-    {{ this.rest }}
+    {{ renderer.rest }}
 {% endspaceless %}
 {% endblock form__widget %}

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

@@ -3,10 +3,10 @@
 {% block row %}
 {% spaceless %}
     <tr>
-        <td>{{ this.label }}</td>
+        <td>{{ renderer.label }}</td>
         <td>
-        {{ this.errors }}
-        {{ this.widget }}
+        {{ renderer.errors }}
+        {{ renderer.widget }}
         </td>
     </tr>
 {% endspaceless %}
@@ -30,7 +30,7 @@
 {% spaceless %}
     <table>
     {{ block('rows') }}
-    {{ this.rest }}
+    {{ renderer.rest }}
     </table>
 {% endspaceless %}
 {% endblock form__widget %}

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

@@ -70,7 +70,7 @@
 {% endblock hidden__widget %}
 
 {% block hidden__row %}
-    {{ this.widget }}
+    {{ renderer.widget }}
 {% endblock hidden__row %}
 
 {% block textarea__widget %}