Merge branch '2.5'

* 2.5: (25 commits)
  [Bridge][Twig] Replace deprecated features
  Yaml component change in 2.5
  [HttpFoundation] fix switch statement
  [serializer] fixed whitespace issue when decoding xml
  [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
  #10862 loadClassMetadata vs loadValidatorMetadata: revert default config
  fixed previous merge
  Added phpdoc for Cache-Control directives methods
  [Console] OutputFormatter Unset Bold has wrong id
  [Debug] fix debug handlers config
  [Serializer] fixed bc-break with cdata-section nodes
  Remove undefined variable $e
  [Debug] fix wrong case mismatch exception
  bumped Symfony version to 2.5.1
  bumped Symfony version to 2.4.7
  bumped Symfony version to 2.3.17
  Fix a parameter name in a test
  updated VERSION for 2.5.0
  updated CHANGELOG for 2.5.0
  updated VERSION for 2.4.6
  ...

Conflicts:
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
	src/Symfony/Component/HttpKernel/Kernel.php

Author: fabpot

Formatter/OutputFormatterStyle.php

@@ -41,7 +41,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
         'white'     => array('set' => 47, 'unset' => 49)
     );
     private static $availableOptions = array(
-        'bold'          => array('set' => 1, 'unset' => 21),
+        'bold'          => array('set' => 1, 'unset' => 22),
         'underscore'    => array('set' => 4, 'unset' => 24),
         'blink'         => array('set' => 5, 'unset' => 25),
         'reverse'       => array('set' => 7, 'unset' => 27),
@@ -202,7 +202,7 @@ public function setOptions(array $options)
     public function apply($text)
     {
         $setCodes = array();
-        $unsetCode = array();
+        $unsetCodes = array();
 
         if (null !== $this->foreground) {
             $setCodes[] = $this->foreground['set'];

Tests/Formatter/OutputFormatterStyleTest.php

@@ -18,7 +18,7 @@ class OutputFormatterStyleTest extends \PHPUnit_Framework_TestCase
     public function testConstructor()
     {
         $style = new OutputFormatterStyle('green', 'black', array('bold', 'underscore'));
-        $this->assertEquals("\033[32;40;1;4mfoo\033[39;49;21;24m", $style->apply('foo'));
+        $this->assertEquals("\033[32;40;1;4mfoo\033[39;49;22;24m", $style->apply('foo'));
 
         $style = new OutputFormatterStyle('red', null, array('blink'));
         $this->assertEquals("\033[31;5mfoo\033[39;25m", $style->apply('foo'));
@@ -63,16 +63,16 @@ public function testOptions()
         $this->assertEquals("\033[7;8mfoo\033[27;28m", $style->apply('foo'));
 
         $style->setOption('bold');
-        $this->assertEquals("\033[7;8;1mfoo\033[27;28;21m", $style->apply('foo'));
+        $this->assertEquals("\033[7;8;1mfoo\033[27;28;22m", $style->apply('foo'));
 
         $style->unsetOption('reverse');
-        $this->assertEquals("\033[8;1mfoo\033[28;21m", $style->apply('foo'));
+        $this->assertEquals("\033[8;1mfoo\033[28;22m", $style->apply('foo'));
 
         $style->setOption('bold');
-        $this->assertEquals("\033[8;1mfoo\033[28;21m", $style->apply('foo'));
+        $this->assertEquals("\033[8;1mfoo\033[28;22m", $style->apply('foo'));
 
         $style->setOptions(array('bold'));
-        $this->assertEquals("\033[1mfoo\033[21m", $style->apply('foo'));
+        $this->assertEquals("\033[1mfoo\033[22m", $style->apply('foo'));
 
         try {
             $style->setOption('foo');