Skip to content

Commit 5cd574f

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: Fix small coding style [2.3] Static Code Analysis for Components [Form] fixed phpdoc CS: Convert double quotes to single quotes Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader. [Validator] added Japanese translation for unmatched charset (id: 80) [DependencyInjection] Highest precedence for user parameters [Translation][MoFileLoader] fixed load empty translation. bumped Symfony version to 2.3.27 updated VERSION for 2.3.26 update CONTRIBUTORS for 2.3.26 updated CHANGELOG for 2.3.26 Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php src/Symfony/Component/Filesystem/Filesystem.php src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Translation/PluralizationRules.php src/Symfony/Component/Validator/Constraints/IssnValidator.php src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf src/Symfony/Component/Yaml/Tests/InlineTest.php
2 parents e222853 + ea461af commit 5cd574f

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

Button.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,7 @@ public function getErrors($deep = false, $flatten = true)
194194
*
195195
* This method should not be invoked.
196196
*
197-
* @param string $modelData
198-
*
199-
* @throws BadMethodCallException
197+
* @param mixed $modelData
200198
*/
201199
public function setData($modelData)
202200
{

NativeRequestHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ private static function fixPhpFilesArray($data)
184184
unset($files[$k]);
185185
}
186186

187-
foreach (array_keys($data['name']) as $key) {
187+
foreach ($data['name'] as $key => $name) {
188188
$files[$key] = self::fixPhpFilesArray(array(
189189
'error' => $data['error'][$key],
190-
'name' => $data['name'][$key],
190+
'name' => $name,
191191
'type' => $data['type'][$key],
192192
'tmp_name' => $data['tmp_name'][$key],
193193
'size' => $data['size'][$key],

Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
1818
{
1919
public function testFixHttpUrl()
2020
{
21-
$data = "www.symfony.com";
21+
$data = 'www.symfony.com';
2222
$form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
2323
$event = new FormEvent($form, $data);
2424

@@ -30,7 +30,7 @@ public function testFixHttpUrl()
3030

3131
public function testSkipKnownUrl()
3232
{
33-
$data = "http://www.symfony.com";
33+
$data = 'http://www.symfony.com';
3434
$form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
3535
$event = new FormEvent($form, $data);
3636

@@ -42,7 +42,7 @@ public function testSkipKnownUrl()
4242

4343
public function testSkipOtherProtocol()
4444
{
45-
$data = "ftp://www.symfony.com";
45+
$data = 'ftp://www.symfony.com';
4646
$form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
4747
$event = new FormEvent($form, $data);
4848

Tests/Extension/Core/EventListener/TrimListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase
1818
{
1919
public function testTrim()
2020
{
21-
$data = " Foo! ";
21+
$data = ' Foo! ';
2222
$form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
2323
$event = new FormEvent($form, $data);
2424

Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function getMockForm()
6363
// https://github.com/symfony/symfony/pull/5838
6464
public function testStringFormData()
6565
{
66-
$data = "XP4HUzmHPi";
66+
$data = 'XP4HUzmHPi';
6767
$event = new FormEvent($this->form, $data);
6868

6969
$validation = new CsrfValidationListener('csrf', $this->tokenManager, 'unknown', 'Invalid.');

0 commit comments

Comments
 (0)