Merge branch '2.3' into 2.4

fabpot · fabpot · commit 60c543469586 · 2014-01-01T09:14:50.000+01:00
* 2.3:
  removed unneeded use statements
  Prepend Child Bundle paths before the parent
  [Routing] add unit tests for Symfony\Component\Routing\RequestContext class

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
	src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
diff --git a/Encoder/ChainDecoder.php b/Encoder/ChainDecoder.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Serializer\Encoder;
 
-use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 
 /**
diff --git a/Encoder/ChainEncoder.php b/Encoder/ChainEncoder.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Serializer\Encoder;
 
-use Symfony\Component\Serializer\Encoder\EncoderInterface;
-use Symfony\Component\Serializer\Encoder\NormalizationAwareInterface;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 
 /**
diff --git a/SerializerAwareInterface.php b/SerializerAwareInterface.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Serializer;
 
-use Symfony\Component\Serializer\SerializerInterface;
-
 /**
  * Defines the interface of encoders
  *

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Serializer;`
`13`	`13`
`14`		`-use Symfony\Component\Serializer\SerializerInterface;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* Defines the interface of encoders`
`18`	`16`	`*`