Skip to content

Commit b2d0d62

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: 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) [WebProfilerBundle] fixed undefined buttons. [WebProfilerBundle] Fix javascript toolbar on IE8 [DependencyInjection] Highest precedence for user parameters bumped Symfony version to 2.6.6 [Translation][MoFileLoader] fixed load empty translation. updated VERSION for 2.6.5 updated CHANGELOG for 2.6.5 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 [HttpKernel] UriSigner::buildUrl - default params for http_build_query Conflicts: src/Symfony/Bridge/Propel1/Tests/DataCollector/PropelDataCollectorTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
2 parents 73f3862 + 8584ef0 commit b2d0d62

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Exception/FileLoaderLoadException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected function varToString($var)
7676
$a[] = sprintf('%s => %s', $k, $this->varToString($v));
7777
}
7878

79-
return sprintf("Array(%s)", implode(', ', $a));
79+
return sprintf('Array(%s)', implode(', ', $a));
8080
}
8181

8282
if (is_resource($var)) {

Tests/Fixtures/Configuration/ExampleConfiguration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function getConfigTreeBuilder()
4545
->info(
4646
"this is a long\n".
4747
"multi-line info text\n".
48-
"which should be indented"
48+
'which should be indented'
4949
)
5050
->example('example setting')
5151
->end()

0 commit comments

Comments
 (0)