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

src/Symfony/Bridge/Propel1/Form/Type/TranslationType.php

@@ -24,8 +24,8 @@ use Symfony\Bridge\Propel1\Form\EventListener\TranslationFormListener;
 class TranslationType extends AbstractType
 {
     /**
-      * {@inheritdoc}
+     * {@inheritdoc}
-      */
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addEventSubscriber(

src/Symfony/Component/ClassLoader/ClassCollectionLoader.php

@@ -353,14 +353,17 @@ class ClassCollectionLoader
             $unresolved = new \ArrayObject();
         }
         $nodeName = $node->getName();
-        $unresolved[$nodeName] = $node;
+
-        foreach ($tree[$nodeName] as $dependency) {
+        if (isset($tree[$nodeName])) {
-            if (!$resolved->offsetExists($dependency->getName())) {
+            $unresolved[$nodeName] = $node;
-                self::resolveDependencies($tree, $dependency, $resolved, $unresolved);
+            foreach ($tree[$nodeName] as $dependency) {
+                if (!$resolved->offsetExists($dependency->getName())) {
+                    self::resolveDependencies($tree, $dependency, $resolved, $unresolved);
+                }
             }
+            $resolved[$nodeName] = $node;
+            unset($unresolved[$nodeName]);
         }
-        $resolved[$nodeName] = $node;
-        unset($unresolved[$nodeName]);
 
         return $resolved;
     }

src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php

@@ -146,6 +146,38 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
         );
     }
 
+    public function testFixClassWithTraitsOrdering()
+    {
+        if (PHP_VERSION_ID < 50400) {
+            $this->markTestSkipped('Requires PHP > 5.4');
+
+            return;
+        }
+
+        require_once __DIR__.'/Fixtures/ClassesWithParents/CTrait.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/F.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/G.php';
+
+        $classes = array(
+            'ClassesWithParents\\F',
+            'ClassesWithParents\\G',
+        );
+
+        $expected = array(
+            'ClassesWithParents\\CTrait',
+            'ClassesWithParents\\F',
+            'ClassesWithParents\\G',
+        );
+
+        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
+        $m = $r->getMethod('getOrderedClasses');
+        $m->setAccessible(true);
+
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
+
+        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
+    }
+
     /**
      * @dataProvider getFixNamespaceDeclarationsData
      */

src/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/F.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+class F
+{
+    use CTrait;
+}

src/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/G.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+class G
+{
+    use CTrait;
+}

src/Symfony/Component/EventDispatcher/Event.php

@@ -20,10 +20,10 @@ namespace Symfony\Component\EventDispatcher;
  * You can call the method stopPropagation() to abort the execution of
  * further listeners in your event listener.
  *
- * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
- * @author  Roman Borschel <roman@code-factory.org>
+ * @author Roman Borschel <roman@code-factory.org>
- * @author  Bernhard Schussek <bschussek@gmail.com>
+ * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @api
  */

src/Symfony/Component/EventDispatcher/EventDispatcher.php

@@ -17,13 +17,13 @@ namespace Symfony\Component\EventDispatcher;
  * Listeners are registered on the manager and events are dispatched through the
  * manager.
  *
- * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
- * @author  Roman Borschel <roman@code-factory.org>
+ * @author Roman Borschel <roman@code-factory.org>
- * @author  Bernhard Schussek <bschussek@gmail.com>
+ * @author Bernhard Schussek <bschussek@gmail.com>
- * @author  Fabien Potencier <fabien@symfony.com>
+ * @author Fabien Potencier <fabien@symfony.com>
- * @author  Jordi Boggiano <j.boggiano@seld.be>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author  Jordan Alliot <jordan.alliot@gmail.com>
+ * @author Jordan Alliot <jordan.alliot@gmail.com>
  *
  * @api
  */

src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php

@@ -17,10 +17,10 @@ namespace Symfony\Component\EventDispatcher;
  * {@link getSubscribedEvents} and registers the subscriber as a listener for all
  * returned events.
  *
- * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
- * @author  Roman Borschel <roman@code-factory.org>
+ * @author Roman Borschel <roman@code-factory.org>
- * @author  Bernhard Schussek <bschussek@gmail.com>
+ * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @api
  */

src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php

@@ -164,7 +164,7 @@ class CurrencyDataGenerator extends AbstractDataGenerator
     }
 
     /**
-     * @param $rootBundle
+     * @param ArrayAccessibleResourceBundle $rootBundle
      *
      * @return array
      */

src/Symfony/Component/PropertyAccess/StringUtil.php

@@ -186,7 +186,7 @@ class StringUtil
                         return $singulars;
                     }
 
-                    return $newBase.($firstUpper ? ucFirst($newSuffix) : $newSuffix);
+                    return $newBase.($firstUpper ? ucfirst($newSuffix) : $newSuffix);
                 }
 
                 // Suffix is longer than word

src/Symfony/Component/Security/Core/Authentication/Provider/AuthenticationProviderInterface.php

@@ -24,12 +24,12 @@ use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterfac
  */
 interface AuthenticationProviderInterface extends AuthenticationManagerInterface
 {
-    /**
+     /**
-     * Checks whether this provider supports the given token.
+      * Checks whether this provider supports the given token.
-     *
+      *
-     * @param TokenInterface $token A TokenInterface instance
+      * @param TokenInterface $token A TokenInterface instance
-     *
+      *
-     * @return bool true if the implementation supports the Token, false otherwise
+      * @return bool true if the implementation supports the Token, false otherwise
-     */
+      */
      public function supports(TokenInterface $token);
 }

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

@@ -117,17 +117,17 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
         return $data;
     }
 
-    /**
+     /**
-     * {@inheritdoc}
+      * {@inheritdoc}
-     */
+      */
      public function supportsEncoding($format)
      {
          return 'xml' === $format;
      }
 
      /**
-     * {@inheritdoc}
+      * {@inheritdoc}
-     */
+      */
      public function supportsDecoding($format)
      {
          return 'xml' === $format;

src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php

@@ -21,15 +21,15 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 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;

src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php

@@ -21,15 +21,15 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 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;