fix deprecated block name

Resources/views/Form/form_admin_fields.html.twig

@@ -89,19 +89,19 @@ file that was distributed with this source code.
         {% endif %}
         {% if preferred_choices|length > 0 %}
             {% set options = preferred_choices %}
-            {{ block('widget_choice_options') }}
+            {{ block('choice_widget_options') }}
             {% if choices|length > 0 %}
                 <option disabled="disabled">{{ separator }}</option>
             {% endif %}
         {% endif %}
         {% set options = choices %}
-        {{ block('widget_choice_options') }}
+        {{ block('choice_widget_options') }}
     </select>
     {% endif %}
 {% endspaceless %}
 {% endblock choice_widget %}
 
-{% block field_row %}
+{% block form_row %}
     {% if sonata_admin is not defined or not sonata_admin_enabled or not sonata_admin.field_description %}
         <div class="control-group {% if errors|length > 0%} error{% endif %}">
             {{ form_label(form, label|default(null)) }}
@@ -140,7 +140,7 @@ file that was distributed with this source code.
             </div>
         </div>
     {% endif %}
-{% endblock field_row %}
+{% endblock form_row %}
 
 {% block collection_widget_row %}
 {% spaceless %}

Resources/views/Form/silex_form_div_layout.html.twig

@@ -17,24 +17,24 @@
         {% endif %}
         {% if preferred_choices|length > 0 %}
             {% set options = preferred_choices %}
-            {{ block('widget_choice_options') }}
+            {{ block('choice_widget_options') }}
             {% if choices|length > 0 and separator is not none %}
                 <option disabled="disabled">{{ separator }}</option>
             {% endif %}
         {% endif %}
         {% set options = choices %}
-        {{ block('widget_choice_options') }}
+        {{ block('choice_widget_options') }}
     </select>
     {% endif %}
 {% endspaceless %}
 {% endblock choice_widget %}
 
-{% block field_widget %}
+{% block form_widget_simple %}
 {% spaceless %}
     {% set type = type|default('text') %}
     <input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" />
 {% endspaceless %}
-{% endblock field_widget %}
+{% endblock form_widget_simple %}
 
 {# Labels #}
 
@@ -61,7 +61,7 @@
 
 {# Rows #}
 
-{% block field_row %}
+{% block form_row %}
 {% spaceless %}
     <div class="control-group {{ (0 < form_errors(form)|length)? 'error':'' }} ">
         {{ form_label(form, label|default(null)) }}
@@ -71,11 +71,11 @@
         </div>
     </div>
 {% endspaceless %}
-{% endblock field_row %}
+{% endblock form_row %}
 
 {# Misc #}
 
-{% block field_errors %}
+{% block form_errors %}
 {% spaceless %}
     {% if errors|length > 0 %}
         {% if not form.hasParent  or 'repeated' in form.get('types') %}
@@ -93,4 +93,4 @@
         {% endif %}
     {% endif %}
 {% endspaceless %}
-{% endblock field_errors %}
+{% endblock form_errors %}