Commit b3e4fbe4 authored by Fabien Potencier's avatar Fabien Potencier

simplified code

parent 5b875899
......@@ -11,7 +11,10 @@
namespace Silex\Application;
use Symfony\Component\Form;
use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\OptionsResolver\OptionsResolver\FormTypeInterface;
/**
* Form trait.
......@@ -32,11 +35,7 @@ trait FormTrait
*/
public function form($data = null, array $options = array(), $type = null)
{
if (null === $type) {
$type = 'Symfony\Component\Form\Extension\Core\Type\FormType';
}
return $this['form.factory']->createBuilder($type, $data, $options);
return $this['form.factory']->createBuilder($type ?: FormType::class, $data, $options);
}
/**
......@@ -47,16 +46,10 @@ trait FormTrait
* @param array $options Options for the form
* @param string|FormTypeInterface $type Type of the form
*
* @return \Symfony\Component\Form\FormBuilder
* @return FormBuilder
*/
public function namedForm($name, $data = null, array $options = array(), $type = null)
{
if (null === $type) {
// BC with Symfony < 2.8
$type = class_exists('Symfony\Component\Form\Extension\Core\Type\RangeType') ? 'Symfony\Component\Form\Extension\Core\Type\FormType' : 'form';
return $this['form.factory']->createNamedBuilder($name, $type ?: FormType::class, $data, $options);
}
return $this['form.factory']->createNamedBuilder($name, $type, $data, $options);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment