Merge branch '2.3'

* 2.3:
  fixed phpdoc
  Fix some annotates
  [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
  [HttpKernel] remove unneeded strtoupper
  updated the composer install command to reflect changes in Composer

Conflicts:
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php

Author: fabpot

README.md

@@ -103,5 +103,5 @@ Resources
 You can run the unit tests with the following command:
 
     $ cd path/to/Symfony/Component/OptionsResolver/
-    $ composer.phar install --dev
+    $ composer.phar install
     $ phpunit