Merge branch '2.7' into 2.8
This commit is contained in:
commit
cdbabb0baa
@ -25,9 +25,7 @@ class DependencyInjectionExtension implements FormExtensionInterface
|
|||||||
private $guesser;
|
private $guesser;
|
||||||
private $guesserLoaded = false;
|
private $guesserLoaded = false;
|
||||||
|
|
||||||
public function __construct(ContainerInterface $container,
|
public function __construct(ContainerInterface $container, array $typeServiceIds, array $typeExtensionServiceIds, array $guesserServiceIds)
|
||||||
array $typeServiceIds, array $typeExtensionServiceIds,
|
|
||||||
array $guesserServiceIds)
|
|
||||||
{
|
{
|
||||||
$this->container = $container;
|
$this->container = $container;
|
||||||
$this->typeServiceIds = $typeServiceIds;
|
$this->typeServiceIds = $typeServiceIds;
|
||||||
|
@ -44,9 +44,6 @@ class BindRequestListener implements EventSubscriberInterface
|
|||||||
|
|
||||||
@trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Pass the Request instance to the \Symfony\Component\Form\Form::handleRequest() method instead.', E_USER_DEPRECATED);
|
@trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Pass the Request instance to the \Symfony\Component\Form\Form::handleRequest() method instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
// Uncomment this as soon as the deprecation note should be shown
|
|
||||||
// @trigger_error('Passing a Request instance to Form::submit() is deprecated since version 2.3 and will be disabled in 3.0. Call Form::process($request) instead.', E_USER_DEPRECATED);
|
|
||||||
|
|
||||||
$name = $form->getConfig()->getName();
|
$name = $form->getConfig()->getName();
|
||||||
$default = $form->getConfig()->getCompound() ? array() : null;
|
$default = $form->getConfig()->getCompound() ? array() : null;
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ class AnnotationLoader implements LoaderInterface
|
|||||||
$attributesMetadata = $classMetadata->getAttributesMetadata();
|
$attributesMetadata = $classMetadata->getAttributesMetadata();
|
||||||
|
|
||||||
foreach ($reflectionClass->getProperties() as $property) {
|
foreach ($reflectionClass->getProperties() as $property) {
|
||||||
if (!isset($attributeMetadata[$property->name])) {
|
if (!isset($attributesMetadata[$property->name])) {
|
||||||
$attributesMetadata[$property->name] = new AttributeMetadata($property->name);
|
$attributesMetadata[$property->name] = new AttributeMetadata($property->name);
|
||||||
$classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);
|
$classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user