Skip to content

Commit 52c1f47

Browse files
committed
Merge branch '2.7' into 2.8
2 parents 47619a9 + d8a584d commit 52c1f47

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

Extension/DependencyInjection/DependencyInjectionExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class DependencyInjectionExtension implements FormExtensionInterface
2525
private $guesser;
2626
private $guesserLoaded = false;
2727

28-
public function __construct(ContainerInterface $container,
29-
array $typeServiceIds, array $typeExtensionServiceIds,
30-
array $guesserServiceIds)
28+
public function __construct(ContainerInterface $container, array $typeServiceIds, array $typeExtensionServiceIds, array $guesserServiceIds)
3129
{
3230
$this->container = $container;
3331
$this->typeServiceIds = $typeServiceIds;

Extension/HttpFoundation/EventListener/BindRequestListener.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ public function preBind(FormEvent $event)
4444

4545
@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);
4646

47-
// Uncomment this as soon as the deprecation note should be shown
48-
// @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);
49-
5047
$name = $form->getConfig()->getName();
5148
$default = $form->getConfig()->getCompound() ? array() : null;
5249

0 commit comments

Comments
 (0)