Merge branch '2.3' into 2.5

* 2.3:
  [Doc] Use Markdown syntax highlighting
  [Finder] tweaked docs
  [Finder] Add info about possibilities offered by SplFileInfo
  fix components tests
  [Intl] FIxed failing test
  [Intl] Generated the data for ICU version 54-rc
  [EventDispatcher] fix doc bloc on EventDispatcherInterface
  [Validator] Update validators.zh_CN.xlf, fix translation error
  bumped Symfony version to 2.3.21
  updated VERSION for 2.3.20
  update CONTRIBUTORS for 2.3.20
  updated CHANGELOG for 2.3.20
  [Intl] Integrated ICU data into Intl component

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php

Author: fabpot

README.md

@@ -7,17 +7,19 @@ frameworks.
 ``HttpKernelInterface`` is the core interface of the Symfony2 full-stack
 framework:
 
-    interface HttpKernelInterface
-    {
-        /**
-         * Handles a Request to convert it to a Response.
-         *
-         * @param  Request $request A Request instance
-         *
-         * @return Response A Response instance
-         */
-        function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
-    }
+```php
+interface HttpKernelInterface
+{
+    /**
+     * Handles a Request to convert it to a Response.
+     *
+     * @param  Request $request A Request instance
+     *
+     * @return Response A Response instance
+     */
+    function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
+}
+```
 
 It takes a ``Request`` as an input and should return a ``Response`` as an
 output. Using this interface makes your code compatible with all frameworks
@@ -27,53 +29,61 @@ free.
 Creating a framework based on the Symfony2 components is really easy. Here is
 a very simple, but fully-featured framework based on the Symfony2 components:
 
-    $routes = new RouteCollection();
-    $routes->add('hello', new Route('/hello', array('_controller' =>
-        function (Request $request) {
-            return new Response(sprintf("Hello %s", $request->get('name')));
-        }
-    )));
+```php
+$routes = new RouteCollection();
+$routes->add('hello', new Route('/hello', array('_controller' =>
+    function (Request $request) {
+        return new Response(sprintf("Hello %s", $request->get('name')));
+    }
+)));
 
-    $request = Request::createFromGlobals();
+$request = Request::createFromGlobals();
 
-    $context = new RequestContext();
-    $context->fromRequest($request);
+$context = new RequestContext();
+$context->fromRequest($request);
 
-    $matcher = new UrlMatcher($routes, $context);
+$matcher = new UrlMatcher($routes, $context);
 
-    $dispatcher = new EventDispatcher();
-    $dispatcher->addSubscriber(new RouterListener($matcher));
+$dispatcher = new EventDispatcher();
+$dispatcher->addSubscriber(new RouterListener($matcher));
 
-    $resolver = new ControllerResolver();
+$resolver = new ControllerResolver();
 
-    $kernel = new HttpKernel($dispatcher, $resolver);
+$kernel = new HttpKernel($dispatcher, $resolver);
 
-    $kernel->handle($request)->send();
+$kernel->handle($request)->send();
+```
 
 This is all you need to create a flexible framework with the Symfony2
 components.
 
 Want to add an HTTP reverse proxy and benefit from HTTP caching and Edge Side
 Includes?
 
-    $kernel = new HttpKernel($dispatcher, $resolver);
+```php
+$kernel = new HttpKernel($dispatcher, $resolver);
 
-    $kernel = new HttpCache($kernel, new Store(__DIR__.'/cache'));
+$kernel = new HttpCache($kernel, new Store(__DIR__.'/cache'));
+```
 
 Want to functional test this small framework?
 
-    $client = new Client($kernel);
-    $crawler = $client->request('GET', '/hello/Fabien');
+```php
+$client = new Client($kernel);
+$crawler = $client->request('GET', '/hello/Fabien');
 
-    $this->assertEquals('Fabien', $crawler->filter('p > span')->text());
+$this->assertEquals('Fabien', $crawler->filter('p > span')->text());
+```
 
 Want nice error pages instead of ugly PHP exceptions?
 
-    $dispatcher->addSubscriber(new ExceptionListener(function (Request $request) {
-        $msg = 'Something went wrong! ('.$request->get('exception')->getMessage().')';
+```php
+$dispatcher->addSubscriber(new ExceptionListener(function (Request $request) {
+    $msg = 'Something went wrong! ('.$request->get('exception')->getMessage().')';
 
-        return new Response($msg, 500);
-    }));
+    return new Response($msg, 500);
+}));
+```
 
 And that's why the simple looking ``HttpKernelInterface`` is so powerful. It
 gives you access to a lot of cool features, ready to be used out of the box,

Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php

@@ -17,7 +17,10 @@ class MergeExtensionConfigurationPassTest extends \PHPUnit_Framework_TestCase
 {
     public function testAutoloadMainExtension()
     {
-        $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerBuilder');
+        $container = $this->getMock(
+            'Symfony\\Component\\DependencyInjection\\ContainerBuilder',
+            array('getExtensionConfig', 'loadFromExtension', 'getParameterBag')
+        );
         $params = $this->getMock('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag');
 
         $container->expects($this->at(0))