Skip to content

Commit c0e70bc

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 4ef4ba1 + ab767c1 commit c0e70bc

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Event/FilterControllerEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private function varToString($var)
8686
$a[] = sprintf('%s => %s', $k, $this->varToString($v));
8787
}
8888

89-
return sprintf("Array(%s)", implode(', ', $a));
89+
return sprintf('Array(%s)', implode(', ', $a));
9090
}
9191

9292
if (is_resource($var)) {

HttpKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ private function varToString($var)
267267
$a[] = sprintf('%s => %s', $k, $this->varToString($v));
268268
}
269269

270-
return sprintf("Array(%s)", implode(', ', $a));
270+
return sprintf('Array(%s)', implode(', ', $a));
271271
}
272272

273273
if (is_resource($var)) {

Tests/HttpCache/HttpCacheTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ public function testEsiCacheSendsTheLowestTtl()
10671067
$this->setNextResponses($responses);
10681068

10691069
$this->request('GET', '/', array(), array(), true);
1070-
$this->assertEquals("Hello World! My name is Bobby.", $this->response->getContent());
1070+
$this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
10711071

10721072
// check for 100 or 99 as the test can be executed after a second change
10731073
$this->assertTrue(in_array($this->response->getTtl(), array(99, 100)));

Tests/Profiler/FileProfilerStorageTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function testReadLineFromFile()
9494
fwrite($h, "line1\n\n\nline2\n");
9595
fseek($h, 0, SEEK_END);
9696

97-
$this->assertEquals("line2", $r->invoke(self::$storage, $h));
98-
$this->assertEquals("line1", $r->invoke(self::$storage, $h));
97+
$this->assertEquals('line2', $r->invoke(self::$storage, $h));
98+
$this->assertEquals('line1', $r->invoke(self::$storage, $h));
9999
}
100100
}

0 commit comments

Comments
 (0)