Merge branch '2.3' into 2.5

* 2.3:
  fix phpdoc's alignment
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader

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

Author: fabpot

Encoder/XmlEncoder.php

@@ -117,17 +117,17 @@ public function decode($data, $format, array $context = array())
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
+     /**
+      * {@inheritdoc}
+      */
      public function supportsEncoding($format)
      {
          return 'xml' === $format;
      }
 
      /**
-     * {@inheritdoc}
-     */
+      * {@inheritdoc}
+      */
      public function supportsDecoding($format)
      {
          return 'xml' === $format;

Tests/Normalizer/TestDenormalizer.php

@@ -21,15 +21,15 @@
 class TestDenormalizer implements DenormalizerInterface
 {
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
     }
 
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return true;

Tests/Normalizer/TestNormalizer.php

@@ -21,15 +21,15 @@
 class TestNormalizer implements NormalizerInterface
 {
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     public function normalize($object, $format = null, array $context = array())
     {
     }
 
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     public function supportsNormalization($data, $format = null)
     {
         return true;