Skip to content

Commit 2466cb6

Browse files
fabpotfabpot
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 b4aa78a + 8e0f3d7 commit 2466cb6

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎Templating/Helper/CodeHelper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function abbrMethod($method)
6262
{
6363
if (false !== strpos($method, '::')) {
6464
list($class, $method) = explode('::', $method, 2);
65-
$result = sprintf("%s::%s()", $this->abbrClass($class), $method);
65+
$result = sprintf('%s::%s()', $this->abbrClass($class), $method);
6666
} elseif ('Closure' === $method) {
6767
$result = sprintf("<abbr title=\"%s\">%s</abbr>", $method, $method);
6868
} else {
@@ -88,7 +88,7 @@ public function formatArgs(array $args)
8888
$short = array_pop($parts);
8989
$formattedValue = sprintf("<em>object</em>(<abbr title=\"%s\">%s</abbr>)", $item[1], $short);
9090
} elseif ('array' === $item[0]) {
91-
$formattedValue = sprintf("<em>array</em>(%s)", is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
91+
$formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
9292
} elseif ('string' === $item[0]) {
9393
$formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES, $this->getCharset()));
9494
} elseif ('null' === $item[0]) {

‎Tests/Controller/RedirectControllerTest.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -155,30 +155,30 @@ public function urlRedirectProvider()
155155
{
156156
return array(
157157
// Standard ports
158-
array('http', null, null, 'http', 80, ""),
159-
array('http', 80, null, 'http', 80, ""),
160-
array('https', null, null, 'http', 80, ""),
161-
array('https', 80, null, 'http', 80, ""),
158+
array('http', null, null, 'http', 80, ''),
159+
array('http', 80, null, 'http', 80, ''),
160+
array('https', null, null, 'http', 80, ''),
161+
array('https', 80, null, 'http', 80, ''),
162162

163-
array('http', null, null, 'https', 443, ""),
164-
array('http', null, 443, 'https', 443, ""),
165-
array('https', null, null, 'https', 443, ""),
166-
array('https', null, 443, 'https', 443, ""),
163+
array('http', null, null, 'https', 443, ''),
164+
array('http', null, 443, 'https', 443, ''),
165+
array('https', null, null, 'https', 443, ''),
166+
array('https', null, 443, 'https', 443, ''),
167167

168168
// Non-standard ports
169-
array('http', null, null, 'http', 8080, ":8080"),
170-
array('http', 4080, null, 'http', 8080, ":4080"),
171-
array('http', 80, null, 'http', 8080, ""),
172-
array('https', null, null, 'http', 8080, ""),
173-
array('https', null, 8443, 'http', 8080, ":8443"),
174-
array('https', null, 443, 'http', 8080, ""),
175-
176-
array('https', null, null, 'https', 8443, ":8443"),
177-
array('https', null, 4443, 'https', 8443, ":4443"),
178-
array('https', null, 443, 'https', 8443, ""),
179-
array('http', null, null, 'https', 8443, ""),
180-
array('http', 8080, 4443, 'https', 8443, ":8080"),
181-
array('http', 80, 4443, 'https', 8443, ""),
169+
array('http', null, null, 'http', 8080, ':8080'),
170+
array('http', 4080, null, 'http', 8080, ':4080'),
171+
array('http', 80, null, 'http', 8080, ''),
172+
array('https', null, null, 'http', 8080, ''),
173+
array('https', null, 8443, 'http', 8080, ':8443'),
174+
array('https', null, 443, 'http', 8080, ''),
175+
176+
array('https', null, null, 'https', 8443, ':8443'),
177+
array('https', null, 4443, 'https', 8443, ':4443'),
178+
array('https', null, 443, 'https', 8443, ''),
179+
array('http', null, null, 'https', 8443, ''),
180+
array('http', 8080, 4443, 'https', 8443, ':8080'),
181+
array('http', 80, 4443, 'https', 8443, ''),
182182
);
183183
}
184184

‎Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public function testValidationAnnotations()
347347

348348
public function testValidationPaths()
349349
{
350-
require_once __DIR__."/Fixtures/TestBundle/TestBundle.php";
350+
require_once __DIR__.'/Fixtures/TestBundle/TestBundle.php';
351351

352352
$container = $this->createContainerFromFile('validation_annotations', array(
353353
'kernel.bundles' => array('TestBundle' => 'Symfony\Bundle\FrameworkBundle\Tests\TestBundle'),

‎Tests/Templating/Helper/FormHelperDivLayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function renderForm(FormView $view, array $vars = array())
6565
protected function renderEnctype(FormView $view)
6666
{
6767
if (!method_exists($form = $this->engine->get('form'), 'enctype')) {
68-
$this->markTestSkipped(sprintf("Deprecated method %s->enctype() is not implemented.", get_class($form)));
68+
$this->markTestSkipped(sprintf('Deprecated method %s->enctype() is not implemented.', get_class($form)));
6969
}
7070

7171
return (string) $form->enctype($view);

‎Tests/Templating/Helper/FormHelperTableLayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected function renderForm(FormView $view, array $vars = array())
6666
protected function renderEnctype(FormView $view)
6767
{
6868
if (!method_exists($form = $this->engine->get('form'), 'enctype')) {
69-
$this->markTestSkipped(sprintf("Deprecated method %s->enctype() is not implemented.", get_class($form)));
69+
$this->markTestSkipped(sprintf('Deprecated method %s->enctype() is not implemented.', get_class($form)));
7070
}
7171

7272
return (string) $form->enctype($view);

‎Tests/Translation/PhpExtractorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public function testExtraction()
4242
"double-quoted key with whitespace and escaped \$\n\" sequences" => "prefixdouble-quoted key with whitespace and escaped \$\n\" sequences",
4343
'single-quoted key with whitespace and nonescaped \$\n\' sequences' => 'prefixsingle-quoted key with whitespace and nonescaped \$\n\' sequences',
4444
'single-quoted key with "quote mark at the end"' => 'prefixsingle-quoted key with "quote mark at the end"',
45-
$expectedHeredoc => "prefix".$expectedHeredoc,
46-
$expectedNowdoc => "prefix".$expectedNowdoc,
45+
$expectedHeredoc => 'prefix'.$expectedHeredoc,
46+
$expectedNowdoc => 'prefix'.$expectedNowdoc,
4747
'{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples' => 'prefix{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
4848
));
4949
$actualCatalogue = $catalogue->all();

0 commit comments

Comments
 (0)