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

Author: fabpot

Event/FilterControllerEvent.php

@@ -86,7 +86,7 @@ private function varToString($var)
                 $a[] = sprintf('%s => %s', $k, $this->varToString($v));
             }
 
-            return sprintf("Array(%s)", implode(', ', $a));
+            return sprintf('Array(%s)', implode(', ', $a));
         }
 
         if (is_resource($var)) {

HttpKernel.php

@@ -269,7 +269,7 @@ private function varToString($var)
                 $a[] = sprintf('%s => %s', $k, $this->varToString($v));
             }
 
-            return sprintf("Array(%s)", implode(', ', $a));
+            return sprintf('Array(%s)', implode(', ', $a));
         }
 
         if (is_resource($var)) {

Tests/HttpCache/HttpCacheTest.php

@@ -1067,7 +1067,7 @@ public function testEsiCacheSendsTheLowestTtl()
         $this->setNextResponses($responses);
 
         $this->request('GET', '/', array(), array(), true);
-        $this->assertEquals("Hello World! My name is Bobby.", $this->response->getContent());
+        $this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
 
         // check for 100 or 99 as the test can be executed after a second change
         $this->assertTrue(in_array($this->response->getTtl(), array(99, 100)));

Tests/Profiler/FileProfilerStorageTest.php

@@ -94,7 +94,7 @@ public function testReadLineFromFile()
         fwrite($h, "line1\n\n\nline2\n");
         fseek($h, 0, SEEK_END);
 
-        $this->assertEquals("line2", $r->invoke(self::$storage, $h));
-        $this->assertEquals("line1", $r->invoke(self::$storage, $h));
+        $this->assertEquals('line2', $r->invoke(self::$storage, $h));
+        $this->assertEquals('line1', $r->invoke(self::$storage, $h));
     }
 }

Tests/UriSignerTest.php

@@ -36,4 +36,16 @@ public function testCheck()
 
         $this->assertTrue($signer->sign('http://example.com/foo?foo=bar&bar=foo') === $signer->sign('http://example.com/foo?bar=foo&foo=bar'));
     }
+
+    public function testCheckWithDifferentArgSeparator()
+    {
+        $this->iniSet('arg_separator.output', '&');
+        $signer = new UriSigner('foobar');
+
+        $this->assertSame(
+            "http://example.com/foo?baz=bay&foo=bar&_hash=rIOcC%2FF3DoEGo%2FvnESjSp7uU9zA9S%2F%2BOLhxgMexoPUM%3D",
+            $signer->sign('http://example.com/foo?foo=bar&baz=bay')
+        );
+        $this->assertTrue($signer->check($signer->sign('http://example.com/foo?foo=bar&baz=bay')));
+    }
 }

UriSigner.php

@@ -92,7 +92,7 @@ private function computeHash($uri)
     private function buildUrl(array $url, array $params = array())
     {
         ksort($params);
-        $url['query'] = http_build_query($params);
+        $url['query'] = http_build_query($params, '', '&');
 
         $scheme   = isset($url['scheme']) ? $url['scheme'].'://' : '';
         $host     = isset($url['host']) ? $url['host'] : '';