Skip to content

Commit 4ad1bd0

Browse files
Merge branch '2.3' into 2.6
* 2.3: Changed visibility of setUp() and tearDown to protected fixed XSS in the exception handler Php Inspections (EA Extended) - static code analysis includes: [2.3] Remove most refs uses Test with local components instead of waiting for the subtree-splitter when possible Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Component/Config/Util/XmlUtils.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/OptionsResolver/Options.php src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php src/Symfony/Component/Yaml/Inline.php
2 parents 160e064 + ae3065f commit 4ad1bd0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Extension/Core/Type/ChoiceType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
134134
// Add "[]" to the name in case a select tag with multiple options is
135135
// displayed. Otherwise only one of the selected options is sent in the
136136
// POST request.
137-
$view->vars['full_name'] = $view->vars['full_name'].'[]';
137+
$view->vars['full_name'] .= '[]';
138138
}
139139
}
140140

Util/ServerParams.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getPostMaxSize()
4444
} elseif (0 === strpos($max, '0')) {
4545
$max = intval($max, 8);
4646
} else {
47-
$max = intval($max);
47+
$max = (int) $max;
4848
}
4949

5050
switch (substr($iniMax, -1)) {

0 commit comments

Comments
 (0)