Merge branch '2.2' into 2.3

fabpot · fabpot · commit 509feab5d067 · 2013-09-19T11:45:20.000+02:00
* 2.2:
  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/Console/Application.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
	src/Symfony/Component/Locale/Locale.php
	src/Symfony/Component/Locale/README.md
	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
diff --git a/CallbackTransformer.php b/CallbackTransformer.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\Form;
 
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
 class CallbackTransformer implements DataTransformerInterface
 {
     /**
diff --git a/README.md b/README.md
@@ -22,5 +22,5 @@ Resources
 You can run the unit tests with the following command:
 
     $ cd path/to/Symfony/Component/Form/
-    $ composer.phar install --dev
+    $ composer.phar install
     $ phpunit

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form;`
`13`	`13`
	`14`	`+use Symfony\Component\Form\Exception\UnexpectedTypeException;`
	`15`	`+use Symfony\Component\Form\Exception\TransformationFailedException;`
	`16`	`+`
`14`	`17`	`class CallbackTransformer implements DataTransformerInterface`
`15`	`18`	`{`
`16`	`19`	`/**`