[3.0][DoctrineBridge] Removed deprecated features
This commit is contained in:
WouterJ
Fabien Potencier
parent
30fc4eea13
commit
6dc3cf9200
@ -1,6 +1,14 @@
|
||||
CHANGELOG
|
||||
=========
|
||||
|
||||
3.0.0
|
||||
-----
|
||||
|
||||
* removed `EntityChoiceList`
|
||||
* removed `$manager` (2nd) and `$class` (3th) arguments of `ORMQueryBuilderLoader`
|
||||
* removed passing a query builder closure to `ORMQueryBuilderLoader`
|
||||
* removed `loader` and `property` options of the `DoctrineType`
|
||||
|
||||
2.7.0
|
||||
-----
|
||||
|
||||
|
||||
@ -1,547 +0,0 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
|
||||
|
||||
@trigger_error('The '.__NAMESPACE__.'\EntityChoiceList class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader instead.', E_USER_DEPRECATED);
|
||||
|
||||
use Doctrine\Common\Persistence\Mapping\ClassMetadata;
|
||||
use Doctrine\Common\Persistence\ObjectManager;
|
||||
use Symfony\Component\Form\Exception\RuntimeException;
|
||||
use Symfony\Component\Form\Exception\StringCastException;
|
||||
use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
|
||||
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
|
||||
|
||||
/**
|
||||
* A choice list presenting a list of Doctrine entities as choices.
|
||||
*
|
||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||
*
|
||||
* @deprecated Deprecated since Symfony 2.7, to be removed in Symfony 3.0.
|
||||
* Use {@link DoctrineChoiceLoader} instead.
|
||||
*/
|
||||
class EntityChoiceList extends ObjectChoiceList
|
||||
{
|
||||
/**
|
||||
* @var ObjectManager
|
||||
*/
|
||||
private $em;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
private $class;
|
||||
|
||||
/**
|
||||
* @var ClassMetadata
|
||||
*/
|
||||
private $classMetadata;
|
||||
|
||||
/**
|
||||
* Metadata for target class of primary key association.
|
||||
*
|
||||
* @var ClassMetadata
|
||||
*/
|
||||
private $idClassMetadata;
|
||||
|
||||
/**
|
||||
* Contains the query builder that builds the query for fetching the
|
||||
* entities.
|
||||
*
|
||||
* This property should only be accessed through queryBuilder.
|
||||
*
|
||||
* @var EntityLoaderInterface
|
||||
*/
|
||||
private $entityLoader;
|
||||
|
||||
/**
|
||||
* The identifier field, if the identifier is not composite.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
private $idField = null;
|
||||
|
||||
/**
|
||||
* Whether to use the identifier for index generation.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $idAsIndex = false;
|
||||
|
||||
/**
|
||||
* Whether to use the identifier for value generation.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $idAsValue = false;
|
||||
|
||||
/**
|
||||
* Whether the entities have already been loaded.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $loaded = false;
|
||||
|
||||
/**
|
||||
* The preferred entities.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
private $preferredEntities = array();
|
||||
|
||||
/**
|
||||
* Creates a new entity choice list.
|
||||
*
|
||||
* @param ObjectManager $manager An EntityManager instance
|
||||
* @param string $class The class name
|
||||
* @param string $labelPath The property path used for the label
|
||||
* @param EntityLoaderInterface $entityLoader An optional query builder
|
||||
* @param array|\Traversable|null $entities An array of choices or null to lazy load
|
||||
* @param array $preferredEntities An array of preferred choices
|
||||
* @param string $groupPath A property path pointing to the property used
|
||||
* to group the choices. Only allowed if
|
||||
* the choices are given as flat array.
|
||||
* @param PropertyAccessorInterface $propertyAccessor The reflection graph for reading property paths.
|
||||
*/
|
||||
public function __construct(ObjectManager $manager, $class, $labelPath = null, EntityLoaderInterface $entityLoader = null, $entities = null, array $preferredEntities = array(), $groupPath = null, PropertyAccessorInterface $propertyAccessor = null)
|
||||
{
|
||||
$this->em = $manager;
|
||||
$this->entityLoader = $entityLoader;
|
||||
$this->classMetadata = $manager->getClassMetadata($class);
|
||||
$this->class = $this->classMetadata->getName();
|
||||
$this->loaded = is_array($entities) || $entities instanceof \Traversable;
|
||||
$this->preferredEntities = $preferredEntities;
|
||||
list(
|
||||
$this->idAsIndex,
|
||||
$this->idAsValue,
|
||||
$this->idField
|
||||
) = $this->getIdentifierInfoForClass($this->classMetadata);
|
||||
|
||||
if (null !== $this->idField && $this->classMetadata->hasAssociation($this->idField)) {
|
||||
$this->idClassMetadata = $this->em->getClassMetadata(
|
||||
$this->classMetadata->getAssociationTargetClass($this->idField)
|
||||
);
|
||||
|
||||
list(
|
||||
$this->idAsIndex,
|
||||
$this->idAsValue
|
||||
) = $this->getIdentifierInfoForClass($this->idClassMetadata);
|
||||
}
|
||||
|
||||
if (!$this->loaded) {
|
||||
// Make sure the constraints of the parent constructor are
|
||||
// fulfilled
|
||||
$entities = array();
|
||||
}
|
||||
|
||||
parent::__construct($entities, $labelPath, $preferredEntities, $groupPath, null, $propertyAccessor);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the list of entities.
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @see ChoiceListInterface
|
||||
*/
|
||||
public function getChoices()
|
||||
{
|
||||
if (!$this->loaded) {
|
||||
$this->load();
|
||||
}
|
||||
|
||||
return parent::getChoices();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the values for the entities.
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @see ChoiceListInterface
|
||||
*/
|
||||
public function getValues()
|
||||
{
|
||||
if (!$this->loaded) {
|
||||
$this->load();
|
||||
}
|
||||
|
||||
return parent::getValues();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the choice views of the preferred choices as nested array with
|
||||
* the choice groups as top-level keys.
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @see ChoiceListInterface
|
||||
*/
|
||||
public function getPreferredViews()
|
||||
{
|
||||
if (!$this->loaded) {
|
||||
$this->load();
|
||||
}
|
||||
|
||||
return parent::getPreferredViews();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the choice views of the choices that are not preferred as nested
|
||||
* array with the choice groups as top-level keys.
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @see ChoiceListInterface
|
||||
*/
|
||||
public function getRemainingViews()
|
||||
{
|
||||
if (!$this->loaded) {
|
||||
$this->load();
|
||||
}
|
||||
|
||||
return parent::getRemainingViews();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the entities corresponding to the given values.
|
||||
*
|
||||
* @param array $values
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @see ChoiceListInterface
|
||||
*/
|
||||
public function getChoicesForValues(array $values)
|
||||
{
|
||||
// Performance optimization
|
||||
// Also prevents the generation of "WHERE id IN ()" queries through the
|
||||
// entity loader. At least with MySQL and on the development machine
|
||||
// this was tested on, no exception was thrown for such invalid
|
||||
// statements, consequently no test fails when this code is removed.
|
||||
// https://github.com/symfony/symfony/pull/8981#issuecomment-24230557
|
||||
if (empty($values)) {
|
||||
return array();
|
||||
}
|
||||
|
||||
if (!$this->loaded) {
|
||||
// Optimize performance in case we have an entity loader and
|
||||
// a single-field identifier
|
||||
if ($this->idAsValue && $this->entityLoader) {
|
||||
$unorderedEntities = $this->entityLoader->getEntitiesByIds($this->idField, $values);
|
||||
$entitiesByValue = array();
|
||||
$entities = array();
|
||||
|
||||
// Maintain order and indices from the given $values
|
||||
// An alternative approach to the following loop is to add the
|
||||
// "INDEX BY" clause to the Doctrine query in the loader,
|
||||
// but I'm not sure whether that's doable in a generic fashion.
|
||||
foreach ($unorderedEntities as $entity) {
|
||||
$value = $this->fixValue($this->getSingleIdentifierValue($entity));
|
||||
$entitiesByValue[$value] = $entity;
|
||||
}
|
||||
|
||||
foreach ($values as $i => $value) {
|
||||
if (isset($entitiesByValue[$value])) {
|
||||
$entities[$i] = $entitiesByValue[$value];
|
||||
}
|
||||
}
|
||||
|
||||
return $entities;
|
||||
}
|
||||
|
||||
$this->load();
|
||||
}
|
||||
|
||||
return parent::getChoicesForValues($values);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the values corresponding to the given entities.
|
||||
*
|
||||
* @param array $entities
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @see ChoiceListInterface
|
||||
*/
|
||||
public function getValuesForChoices(array $entities)
|
||||
{
|
||||
// Performance optimization
|
||||
if (empty($entities)) {
|
||||
return array();
|
||||
}
|
||||
|
||||
if (!$this->loaded) {
|
||||
// Optimize performance for single-field identifiers. We already
|
||||
// know that the IDs are used as values
|
||||
|
||||
// Attention: This optimization does not check choices for existence
|
||||
if ($this->idAsValue) {
|
||||
$values = array();
|
||||
|
||||
foreach ($entities as $i => $entity) {
|
||||
if ($entity instanceof $this->class) {
|
||||
// Make sure to convert to the right format
|
||||
$values[$i] = $this->fixValue($this->getSingleIdentifierValue($entity));
|
||||
}
|
||||
}
|
||||
|
||||
return $values;
|
||||
}
|
||||
|
||||
$this->load();
|
||||
}
|
||||
|
||||
return parent::getValuesForChoices($entities);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the indices corresponding to the given entities.
|
||||
*
|
||||
* @param array $entities
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @see ChoiceListInterface
|
||||
* @deprecated since version 2.4, to be removed in 3.0.
|
||||
*/
|
||||
public function getIndicesForChoices(array $entities)
|
||||
{
|
||||
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
|
||||
|
||||
// Performance optimization
|
||||
if (empty($entities)) {
|
||||
return array();
|
||||
}
|
||||
|
||||
if (!$this->loaded) {
|
||||
// Optimize performance for single-field identifiers. We already
|
||||
// know that the IDs are used as indices
|
||||
|
||||
// Attention: This optimization does not check choices for existence
|
||||
if ($this->idAsIndex) {
|
||||
$indices = array();
|
||||
|
||||
foreach ($entities as $i => $entity) {
|
||||
if ($entity instanceof $this->class) {
|
||||
// Make sure to convert to the right format
|
||||
$indices[$i] = $this->fixIndex($this->getSingleIdentifierValue($entity));
|
||||
}
|
||||
}
|
||||
|
||||
return $indices;
|
||||
}
|
||||
|
||||
$this->load();
|
||||
}
|
||||
|
||||
return parent::getIndicesForChoices($entities);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the entities corresponding to the given values.
|
||||
*
|
||||
* @param array $values
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @see ChoiceListInterface
|
||||
* @deprecated since version 2.4, to be removed in 3.0.
|
||||
*/
|
||||
public function getIndicesForValues(array $values)
|
||||
{
|
||||
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
|
||||
|
||||
// Performance optimization
|
||||
if (empty($values)) {
|
||||
return array();
|
||||
}
|
||||
|
||||
if (!$this->loaded) {
|
||||
// Optimize performance for single-field identifiers.
|
||||
|
||||
// Attention: This optimization does not check values for existence
|
||||
if ($this->idAsIndex && $this->idAsValue) {
|
||||
return $this->fixIndices($values);
|
||||
}
|
||||
|
||||
$this->load();
|
||||
}
|
||||
|
||||
return parent::getIndicesForValues($values);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new unique index for this entity.
|
||||
*
|
||||
* If the entity has a single-field identifier, this identifier is used.
|
||||
*
|
||||
* Otherwise a new integer is generated.
|
||||
*
|
||||
* @param mixed $entity The choice to create an index for
|
||||
*
|
||||
* @return int|string A unique index containing only ASCII letters,
|
||||
* digits and underscores.
|
||||
*/
|
||||
protected function createIndex($entity)
|
||||
{
|
||||
if ($this->idAsIndex) {
|
||||
return $this->fixIndex($this->getSingleIdentifierValue($entity));
|
||||
}
|
||||
|
||||
return parent::createIndex($entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new unique value for this entity.
|
||||
*
|
||||
* If the entity has a single-field identifier, this identifier is used.
|
||||
*
|
||||
* Otherwise a new integer is generated.
|
||||
*
|
||||
* @param mixed $entity The choice to create a value for
|
||||
*
|
||||
* @return int|string A unique value without character limitations.
|
||||
*/
|
||||
protected function createValue($entity)
|
||||
{
|
||||
if ($this->idAsValue) {
|
||||
return (string) $this->getSingleIdentifierValue($entity);
|
||||
}
|
||||
|
||||
return parent::createValue($entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function fixIndex($index)
|
||||
{
|
||||
$index = parent::fixIndex($index);
|
||||
|
||||
// If the ID is a single-field integer identifier, it is used as
|
||||
// index. Replace any leading minus by underscore to make it a valid
|
||||
// form name.
|
||||
if ($this->idAsIndex && $index < 0) {
|
||||
$index = strtr($index, '-', '_');
|
||||
}
|
||||
|
||||
return $index;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get identifier information for a class.
|
||||
*
|
||||
* @param ClassMetadata $classMetadata The entity metadata
|
||||
*
|
||||
* @return array Return an array with idAsIndex, idAsValue and identifier
|
||||
*/
|
||||
private function getIdentifierInfoForClass(ClassMetadata $classMetadata)
|
||||
{
|
||||
$identifier = null;
|
||||
$idAsIndex = false;
|
||||
$idAsValue = false;
|
||||
|
||||
$identifiers = $classMetadata->getIdentifierFieldNames();
|
||||
|
||||
if (1 === count($identifiers)) {
|
||||
$identifier = $identifiers[0];
|
||||
|
||||
if (!$classMetadata->hasAssociation($identifier)) {
|
||||
$idAsValue = true;
|
||||
|
||||
if (in_array($classMetadata->getTypeOfField($identifier), array('integer', 'smallint', 'bigint'))) {
|
||||
$idAsIndex = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return array($idAsIndex, $idAsValue, $identifier);
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the list with entities.
|
||||
*
|
||||
* @throws StringCastException
|
||||
*/
|
||||
private function load()
|
||||
{
|
||||
if ($this->entityLoader) {
|
||||
$entities = $this->entityLoader->getEntities();
|
||||
} else {
|
||||
$entities = $this->em->getRepository($this->class)->findAll();
|
||||
}
|
||||
|
||||
try {
|
||||
// The second parameter $labels is ignored by ObjectChoiceList
|
||||
parent::initialize($entities, array(), $this->preferredEntities);
|
||||
} catch (StringCastException $e) {
|
||||
throw new StringCastException(str_replace('argument $labelPath', 'option "property"', $e->getMessage()), null, $e);
|
||||
}
|
||||
|
||||
$this->loaded = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the first (and only) value of the identifier fields of an entity.
|
||||
*
|
||||
* Doctrine must know about this entity, that is, the entity must already
|
||||
* be persisted or added to the identity map before. Otherwise an
|
||||
* exception is thrown.
|
||||
*
|
||||
* @param object $entity The entity for which to get the identifier
|
||||
*
|
||||
* @return array The identifier values
|
||||
*
|
||||
* @throws RuntimeException If the entity does not exist in Doctrine's identity map
|
||||
*/
|
||||
private function getSingleIdentifierValue($entity)
|
||||
{
|
||||
$value = current($this->getIdentifierValues($entity));
|
||||
|
||||
if ($this->idClassMetadata) {
|
||||
$class = $this->idClassMetadata->getName();
|
||||
if ($value instanceof $class) {
|
||||
$value = current($this->idClassMetadata->getIdentifierValues($value));
|
||||
}
|
||||
}
|
||||
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the values of the identifier fields of an entity.
|
||||
*
|
||||
* Doctrine must know about this entity, that is, the entity must already
|
||||
* be persisted or added to the identity map before. Otherwise an
|
||||
* exception is thrown.
|
||||
*
|
||||
* @param object $entity The entity for which to get the identifier
|
||||
*
|
||||
* @return array The identifier values
|
||||
*
|
||||
* @throws RuntimeException If the entity does not exist in Doctrine's identity map
|
||||
*/
|
||||
private function getIdentifierValues($entity)
|
||||
{
|
||||
if (!$this->em->contains($entity)) {
|
||||
throw new RuntimeException(
|
||||
'Entities passed to the choice field must be managed. Maybe '.
|
||||
'persist them in the entity manager?'
|
||||
);
|
||||
}
|
||||
|
||||
$this->em->initializeObject($entity);
|
||||
|
||||
return $this->classMetadata->getIdentifierValues($entity);
|
||||
}
|
||||
}
|
||||
@ -11,10 +11,8 @@
|
||||
|
||||
namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
|
||||
|
||||
use Symfony\Component\Form\Exception\UnexpectedTypeException;
|
||||
use Doctrine\ORM\QueryBuilder;
|
||||
use Doctrine\DBAL\Connection;
|
||||
use Doctrine\Common\Persistence\ObjectManager;
|
||||
|
||||
/**
|
||||
* Loads entities using a {@link QueryBuilder} instance.
|
||||
@ -37,42 +35,10 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
|
||||
/**
|
||||
* Construct an ORM Query Builder Loader.
|
||||
*
|
||||
* @param QueryBuilder|\Closure $queryBuilder The query builder or a closure
|
||||
* for creating the query builder.
|
||||
* Passing a closure is
|
||||
* deprecated and will not be
|
||||
* supported anymore as of
|
||||
* Symfony 3.0.
|
||||
* @param ObjectManager $manager Deprecated.
|
||||
* @param string $class Deprecated.
|
||||
*
|
||||
* @throws UnexpectedTypeException
|
||||
* @param QueryBuilder $queryBuilder The query builder for creating the query builder.
|
||||
*/
|
||||
public function __construct($queryBuilder, $manager = null, $class = null)
|
||||
public function __construct(QueryBuilder $queryBuilder)
|
||||
{
|
||||
// If a query builder was passed, it must be a closure or QueryBuilder
|
||||
// instance
|
||||
if (!($queryBuilder instanceof QueryBuilder || $queryBuilder instanceof \Closure)) {
|
||||
throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder or \Closure');
|
||||
}
|
||||
|
||||
if ($queryBuilder instanceof \Closure) {
|
||||
@trigger_error('Passing a QueryBuilder closure to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
|
||||
|
||||
if (!$manager instanceof ObjectManager) {
|
||||
throw new UnexpectedTypeException($manager, 'Doctrine\Common\Persistence\ObjectManager');
|
||||
}
|
||||
|
||||
@trigger_error('Passing an EntityManager to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
|
||||
@trigger_error('Passing a class to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
|
||||
|
||||
$queryBuilder = $queryBuilder($manager->getRepository($class));
|
||||
|
||||
if (!$queryBuilder instanceof QueryBuilder) {
|
||||
throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');
|
||||
}
|
||||
}
|
||||
|
||||
$this->queryBuilder = $queryBuilder;
|
||||
}
|
||||
|
||||
|
||||
@ -140,7 +140,6 @@ abstract class DoctrineType extends AbstractType
|
||||
$options['em'],
|
||||
$options['class'],
|
||||
$qbParts,
|
||||
$options['loader'],
|
||||
));
|
||||
|
||||
if (isset($this->choiceLoaders[$hash])) {
|
||||
@ -148,9 +147,7 @@ abstract class DoctrineType extends AbstractType
|
||||
}
|
||||
}
|
||||
|
||||
if ($options['loader']) {
|
||||
$entityLoader = $options['loader'];
|
||||
} elseif (null !== $options['query_builder']) {
|
||||
if (null !== $options['query_builder']) {
|
||||
$entityLoader = $this->getLoader($options['em'], $options['query_builder'], $options['class']);
|
||||
} else {
|
||||
$queryBuilder = $options['em']->getRepository($options['class'])->createQueryBuilder('e');
|
||||
@ -173,16 +170,6 @@ abstract class DoctrineType extends AbstractType
|
||||
}
|
||||
};
|
||||
|
||||
$choiceLabel = function (Options $options) {
|
||||
// BC with the "property" option
|
||||
if ($options['property']) {
|
||||
return $options['property'];
|
||||
}
|
||||
|
||||
// BC: use __toString() by default
|
||||
return array(__CLASS__, 'createChoiceLabel');
|
||||
};
|
||||
|
||||
$choiceName = function (Options $options) {
|
||||
/** @var IdReader $idReader */
|
||||
$idReader = $options['id_reader'];
|
||||
@ -236,15 +223,6 @@ abstract class DoctrineType extends AbstractType
|
||||
return $em;
|
||||
};
|
||||
|
||||
// deprecation note
|
||||
$propertyNormalizer = function (Options $options, $propertyName) {
|
||||
if ($propertyName) {
|
||||
@trigger_error('The "property" option is deprecated since version 2.7 and will be removed in 3.0. Use "choice_label" instead.', E_USER_DEPRECATED);
|
||||
}
|
||||
|
||||
return $propertyName;
|
||||
};
|
||||
|
||||
// Invoke the query builder closure so that we can cache choice lists
|
||||
// for equal query builders
|
||||
$queryBuilderNormalizer = function (Options $options, $queryBuilder) {
|
||||
@ -255,15 +233,6 @@ abstract class DoctrineType extends AbstractType
|
||||
return $queryBuilder;
|
||||
};
|
||||
|
||||
// deprecation note
|
||||
$loaderNormalizer = function (Options $options, $loader) {
|
||||
if ($loader) {
|
||||
@trigger_error('The "loader" option is deprecated since version 2.7 and will be removed in 3.0. Override getLoader() instead.', E_USER_DEPRECATED);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
};
|
||||
|
||||
// Set the "id_reader" option via the normalizer. This option is not
|
||||
// supposed to be set by the user.
|
||||
$idReaderNormalizer = function (Options $options) {
|
||||
@ -288,13 +257,11 @@ abstract class DoctrineType extends AbstractType
|
||||
|
||||
$resolver->setDefaults(array(
|
||||
'em' => null,
|
||||
'property' => null, // deprecated, use "choice_label"
|
||||
'query_builder' => null,
|
||||
'loader' => null, // deprecated, use "choice_loader"
|
||||
'choices' => null,
|
||||
'choices_as_values' => true,
|
||||
'choice_loader' => $choiceLoader,
|
||||
'choice_label' => $choiceLabel,
|
||||
'choice_label' => array(__CLASS__, 'createChoiceLabel'),
|
||||
'choice_name' => $choiceName,
|
||||
'choice_value' => $choiceValue,
|
||||
'id_reader' => null, // internal
|
||||
@ -304,13 +271,10 @@ abstract class DoctrineType extends AbstractType
|
||||
$resolver->setRequired(array('class'));
|
||||
|
||||
$resolver->setNormalizer('em', $emNormalizer);
|
||||
$resolver->setNormalizer('property', $propertyNormalizer);
|
||||
$resolver->setNormalizer('query_builder', $queryBuilderNormalizer);
|
||||
$resolver->setNormalizer('loader', $loaderNormalizer);
|
||||
$resolver->setNormalizer('id_reader', $idReaderNormalizer);
|
||||
|
||||
$resolver->setAllowedTypes('em', array('null', 'string', 'Doctrine\Common\Persistence\ObjectManager'));
|
||||
$resolver->setAllowedTypes('loader', array('null', 'Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -53,7 +53,7 @@ class EntityType extends DoctrineType
|
||||
*/
|
||||
public function getLoader(ObjectManager $manager, $queryBuilder, $class)
|
||||
{
|
||||
return new ORMQueryBuilderLoader($queryBuilder, $manager, $class);
|
||||
return new ORMQueryBuilderLoader($queryBuilder);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Bridge\Doctrine\Tests;
|
||||
|
||||
@trigger_error('The '.__NAMESPACE__.'\DoctrineOrmTestCase class is deprecated since version 2.4 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper class instead.', E_USER_DEPRECATED);
|
||||
|
||||
use Doctrine\ORM\EntityManager;
|
||||
use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
|
||||
|
||||
/**
|
||||
* Class DoctrineOrmTestCase.
|
||||
*
|
||||
* @deprecated since version 2.4, to be removed in 3.0.
|
||||
* Use {@link DoctrineTestHelper} instead.
|
||||
*/
|
||||
abstract class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
* @return EntityManager
|
||||
*/
|
||||
public static function createTestEntityManager()
|
||||
{
|
||||
return DoctrineTestHelper::createTestEntityManager();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user