Rename sonata_admin_help option to sonata_admin

Form/Extension/Field/Type/FormTypeFieldExtension.php

@@ -50,7 +50,7 @@ class FormTypeFieldExtension extends AbstractTypeExtension
         );
 
         $builder->setAttribute('sonata_admin_enabled', false);
-        $builder->setAttribute('sonata_admin_help', false);
+        $builder->setAttribute('sonata_help', false);
 
         if ($options['sonata_field_description'] instanceof FieldDescriptionInterface) {
             $fieldDescription = $options['sonata_field_description'];
@@ -109,7 +109,7 @@ class FormTypeFieldExtension extends AbstractTypeExtension
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $sonataAdmin     = $form->getConfig()->getAttribute('sonata_admin');
-        $sonataAdminHelp = isset($options['sonata_admin_help']) ? $options['sonata_admin_help'] : null;
+        $sonataAdminHelp = isset($options['sonata_help']) ? $options['sonata_help'] : null;
 
         // avoid to add extra information not required by non admin field
         if ($sonataAdmin && $form->getConfig()->getAttribute('sonata_admin_enabled', true)) {
@@ -144,7 +144,7 @@ class FormTypeFieldExtension extends AbstractTypeExtension
             $view->vars['sonata_admin_enabled'] = false;
         }
 
-        $view->vars['sonata_admin_help'] = $sonataAdminHelp;
+        $view->vars['sonata_help'] = $sonataAdminHelp;
         $view->vars['sonata_admin']      = $sonataAdmin;
     }
 
@@ -171,7 +171,7 @@ class FormTypeFieldExtension extends AbstractTypeExtension
 
             // be compatible with mopa if not installed, avoid generating an exception for invalid option
             'label_render'             => true,
-            'sonata_admin_help'        => null
+            'sonata_help'        => null
         ));
     }
 

Resources/doc/reference/form_help_message.rst

@@ -61,7 +61,7 @@ Help messages in a sub-field
                 ->add('settings', 'sonata_type_immutable_array', array(
                     'keys' => array(
                         array('content', 'textarea', array(
-                            'sonata_admin_help' => 'Set the content'
+                            'sonata_help' => 'Set the content'
                         )),
                         array('public', 'checkbox', array()),
                     )

Resources/views/Form/form_admin_fields.html.twig

@@ -13,8 +13,8 @@ file that was distributed with this source code.
 
 {% block form_widget -%}
     {{ parent() }}
-    {% if sonata_admin_help is defined and sonata_admin_help %}
-        <span class="help-block sonata-ba-field-widget-help">{{ sonata_admin_help|raw }}</span>
+    {% if sonata_help is defined and sonata_help %}
+        <span class="help-block sonata-ba-field-widget-help">{{ sonata_help|raw }}</span>
     {% endif %}
 {%- endblock form_widget %}
 

Tests/Form/Extension/Field/Type/FormTypeFieldExtensionTest.php

@@ -39,11 +39,11 @@ class FormTypeFieldExtensionTest extends \PHPUnit_Framework_TestCase
 
         $this->assertArrayHasKey('sonata_admin', $options);
         $this->assertArrayHasKey('sonata_field_description', $options);
-        $this->assertArrayHasKey('sonata_admin_help', $options);
+        $this->assertArrayHasKey('sonata_help', $options);
 
         $this->assertNull($options['sonata_admin']);
         $this->assertNull($options['sonata_field_description']);
-        $this->assertNull($options['sonata_admin_help']);
+        $this->assertNull($options['sonata_help']);
     }
 
     public function testbuildViewWithNoSonataAdminArray()
@@ -99,7 +99,7 @@ class FormTypeFieldExtensionTest extends \PHPUnit_Framework_TestCase
 
         $extension = new FormTypeFieldExtension();
         $extension->buildView($formView, $form, array(
-            'sonata_admin_help' => 'help text'
+            'sonata_help' => 'help text'
         ));
 
         $this->assertArrayHasKey('block_prefixes', $formView->vars);
@@ -117,6 +117,6 @@ class FormTypeFieldExtensionTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals($expected, $formView->vars['block_prefixes']);
         $this->assertTrue($formView->vars['sonata_admin_enabled']);
-        $this->assertEquals('help text', $formView->vars['sonata_admin_help']);
+        $this->assertEquals('help text', $formView->vars['sonata_help']);
     }
 }