[Form] Improved performance of ChoiceType and its subtypes
This commit is contained in:
parent
77f4b23093
commit
a0ef1018d6
@ -111,7 +111,12 @@ abstract class DoctrineType extends AbstractType
|
|||||||
public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null)
|
public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null)
|
||||||
{
|
{
|
||||||
$this->registry = $registry;
|
$this->registry = $registry;
|
||||||
$this->choiceListFactory = $choiceListFactory ?: new PropertyAccessDecorator(new DefaultChoiceListFactory(), $propertyAccessor);
|
$this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(
|
||||||
|
new PropertyAccessDecorator(
|
||||||
|
new DefaultChoiceListFactory(),
|
||||||
|
$propertyAccessor
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
namespace Symfony\Bridge\Doctrine\Form\Type;
|
namespace Symfony\Bridge\Doctrine\Form\Type;
|
||||||
|
|
||||||
use Doctrine\Common\Persistence\ObjectManager;
|
use Doctrine\Common\Persistence\ObjectManager;
|
||||||
|
use Doctrine\ORM\Query\Parameter;
|
||||||
use Doctrine\ORM\QueryBuilder;
|
use Doctrine\ORM\QueryBuilder;
|
||||||
use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
|
use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
|
||||||
use Symfony\Component\Form\Exception\UnexpectedTypeException;
|
use Symfony\Component\Form\Exception\UnexpectedTypeException;
|
||||||
@ -75,8 +76,20 @@ class EntityType extends DoctrineType
|
|||||||
public function getQueryBuilderPartsForCachingHash($queryBuilder)
|
public function getQueryBuilderPartsForCachingHash($queryBuilder)
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
$queryBuilder->getQuery()->getSQL(),
|
$queryBuilder->getQuery()->getSQL(),
|
||||||
$queryBuilder->getParameters()->toArray(),
|
array_map(array($this, 'parameterToArray'), $queryBuilder->getParameters()->toArray()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a query parameter to an array.
|
||||||
|
*
|
||||||
|
* @param Parameter $parameter The query parameter
|
||||||
|
*
|
||||||
|
* @return array The array representation of the parameter
|
||||||
|
*/
|
||||||
|
private function parameterToArray(Parameter $parameter)
|
||||||
|
{
|
||||||
|
return array($parameter->getName(), $parameter->getType(), $parameter->getValue());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1114,6 +1114,69 @@ class EntityTypeTest extends TypeTestCase
|
|||||||
$this->assertSame($choiceList1, $choiceList3);
|
$this->assertSame($choiceList1, $choiceList3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testLoaderCachingWithParameters()
|
||||||
|
{
|
||||||
|
$entity1 = new SingleIntIdEntity(1, 'Foo');
|
||||||
|
$entity2 = new SingleIntIdEntity(2, 'Bar');
|
||||||
|
$entity3 = new SingleIntIdEntity(3, 'Baz');
|
||||||
|
|
||||||
|
$this->persist(array($entity1, $entity2, $entity3));
|
||||||
|
|
||||||
|
$repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
|
||||||
|
|
||||||
|
$entityType = new EntityType(
|
||||||
|
$this->emRegistry,
|
||||||
|
PropertyAccess::createPropertyAccessor()
|
||||||
|
);
|
||||||
|
|
||||||
|
$entityTypeGuesser = new DoctrineOrmTypeGuesser($this->emRegistry);
|
||||||
|
|
||||||
|
$factory = Forms::createFormFactoryBuilder()
|
||||||
|
->addType($entityType)
|
||||||
|
->addTypeGuesser($entityTypeGuesser)
|
||||||
|
->getFormFactory();
|
||||||
|
|
||||||
|
$formBuilder = $factory->createNamedBuilder('form', 'form');
|
||||||
|
|
||||||
|
$formBuilder->add('property1', 'entity', array(
|
||||||
|
'em' => 'default',
|
||||||
|
'class' => self::SINGLE_IDENT_CLASS,
|
||||||
|
'query_builder' => $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1),
|
||||||
|
));
|
||||||
|
|
||||||
|
$formBuilder->add('property2', 'entity', array(
|
||||||
|
'em' => 'default',
|
||||||
|
'class' => self::SINGLE_IDENT_CLASS,
|
||||||
|
'query_builder' => function (EntityRepository $repo) {
|
||||||
|
return $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1);
|
||||||
|
},
|
||||||
|
));
|
||||||
|
|
||||||
|
$formBuilder->add('property3', 'entity', array(
|
||||||
|
'em' => 'default',
|
||||||
|
'class' => self::SINGLE_IDENT_CLASS,
|
||||||
|
'query_builder' => function (EntityRepository $repo) {
|
||||||
|
return $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1);
|
||||||
|
},
|
||||||
|
));
|
||||||
|
|
||||||
|
$form = $formBuilder->getForm();
|
||||||
|
|
||||||
|
$form->submit(array(
|
||||||
|
'property1' => 1,
|
||||||
|
'property2' => 1,
|
||||||
|
'property3' => 2,
|
||||||
|
));
|
||||||
|
|
||||||
|
$choiceList1 = $form->get('property1')->getConfig()->getOption('choice_list');
|
||||||
|
$choiceList2 = $form->get('property2')->getConfig()->getOption('choice_list');
|
||||||
|
$choiceList3 = $form->get('property3')->getConfig()->getOption('choice_list');
|
||||||
|
|
||||||
|
$this->assertInstanceOf('Symfony\Component\Form\ChoiceList\ChoiceListInterface', $choiceList1);
|
||||||
|
$this->assertSame($choiceList1, $choiceList2);
|
||||||
|
$this->assertSame($choiceList1, $choiceList3);
|
||||||
|
}
|
||||||
|
|
||||||
public function testCacheChoiceLists()
|
public function testCacheChoiceLists()
|
||||||
{
|
{
|
||||||
$entity1 = new SingleIntIdEntity(1, 'Foo');
|
$entity1 = new SingleIntIdEntity(1, 'Foo');
|
||||||
|
@ -57,6 +57,19 @@
|
|||||||
<!-- CoreExtension -->
|
<!-- CoreExtension -->
|
||||||
<service id="form.property_accessor" alias="property_accessor" public="false" />
|
<service id="form.property_accessor" alias="property_accessor" public="false" />
|
||||||
|
|
||||||
|
<service id="form.choice_list_factory.default" class="Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory" public="false"/>
|
||||||
|
|
||||||
|
<service id="form.choice_list_factory.property_access" class="Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator" public="false">
|
||||||
|
<argument type="service" id="form.choice_list_factory.default"/>
|
||||||
|
<argument type="service" id="form.property_accessor"/>
|
||||||
|
</service>
|
||||||
|
|
||||||
|
<service id="form.choice_list_factory.cached" class="Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator" public="false">
|
||||||
|
<argument type="service" id="form.choice_list_factory.property_access"/>
|
||||||
|
</service>
|
||||||
|
|
||||||
|
<service id="form.choice_list_factory" alias="form.choice_list_factory.cached" public="false"/>
|
||||||
|
|
||||||
<service id="form.type.form" class="Symfony\Component\Form\Extension\Core\Type\FormType">
|
<service id="form.type.form" class="Symfony\Component\Form\Extension\Core\Type\FormType">
|
||||||
<argument type="service" id="form.property_accessor" />
|
<argument type="service" id="form.property_accessor" />
|
||||||
<tag name="form.type" alias="form" />
|
<tag name="form.type" alias="form" />
|
||||||
@ -69,6 +82,7 @@
|
|||||||
</service>
|
</service>
|
||||||
<service id="form.type.choice" class="Symfony\Component\Form\Extension\Core\Type\ChoiceType">
|
<service id="form.type.choice" class="Symfony\Component\Form\Extension\Core\Type\ChoiceType">
|
||||||
<tag name="form.type" alias="choice" />
|
<tag name="form.type" alias="choice" />
|
||||||
|
<argument type="service" id="form.choice_list_factory"/>
|
||||||
</service>
|
</service>
|
||||||
<service id="form.type.collection" class="Symfony\Component\Form\Extension\Core\Type\CollectionType">
|
<service id="form.type.collection" class="Symfony\Component\Form\Extension\Core\Type\CollectionType">
|
||||||
<tag name="form.type" alias="collection" />
|
<tag name="form.type" alias="collection" />
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
namespace Symfony\Component\Form\Extension\Core\Type;
|
namespace Symfony\Component\Form\Extension\Core\Type;
|
||||||
|
|
||||||
use Symfony\Component\Form\AbstractType;
|
use Symfony\Component\Form\AbstractType;
|
||||||
|
use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
|
||||||
use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator;
|
use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator;
|
||||||
use Symfony\Component\Form\ChoiceList\LegacyChoiceListAdapter;
|
use Symfony\Component\Form\ChoiceList\LegacyChoiceListAdapter;
|
||||||
use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
|
use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
|
||||||
@ -46,7 +47,11 @@ class ChoiceType extends AbstractType
|
|||||||
|
|
||||||
public function __construct(ChoiceListFactoryInterface $choiceListFactory = null)
|
public function __construct(ChoiceListFactoryInterface $choiceListFactory = null)
|
||||||
{
|
{
|
||||||
$this->choiceListFactory = $choiceListFactory ?: new PropertyAccessDecorator(new DefaultChoiceListFactory());
|
$this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(
|
||||||
|
new PropertyAccessDecorator(
|
||||||
|
new DefaultChoiceListFactory()
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user