Skip to content

Commit 41d84cd

Browse files
Merge branch '2.7' into 2.8
* 2.7: [DI] Remove unused props from the PhpDumper [ProxyManager] Cleanup fixtures [Debug] HTML-escape array key Add some phpdocs for IDE autocompletion and better SCA
2 parents 73bba41 + a40457a commit 41d84cd

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

Extension/Core/EventListener/ResizeFormListener.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\Form\FormEvent;
1616
use Symfony\Component\Form\Exception\UnexpectedTypeException;
1717
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
18+
use Symfony\Component\Form\FormInterface;
1819

1920
/**
2021
* Resize a collection form element based on the data sent from the client.
@@ -146,6 +147,7 @@ public function onSubmit(FormEvent $event)
146147

147148
if ($this->deleteEmpty) {
148149
$previousData = $event->getForm()->getData();
150+
/** @var FormInterface $child */
149151
foreach ($form as $name => $child) {
150152
$isNew = !isset($previousData[$name]);
151153

Extension/Core/Type/ChoiceType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
120120
// Reconstruct the data as mapping from child names to values
121121
$data = array();
122122

123+
/** @var FormInterface $child */
123124
foreach ($form as $child) {
124125
$value = $child->getConfig()->getOption('value');
125126

Extension/Validator/Constraints/FormValidator.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public function validate($form, Constraint $constraint)
9898
} else {
9999
$childrenSynchronized = true;
100100

101+
/** @var FormInterface $child */
101102
foreach ($form as $child) {
102103
if (!$child->isSynchronized()) {
103104
$childrenSynchronized = false;

0 commit comments

Comments
 (0)