Merge branch '3.4' into 4.3

* 3.4:
  Backported return type violation bugfixes.

src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php

@@ -26,6 +26,7 @@ use Symfony\Component\Form\FormFactoryBuilder;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationInterface;
+use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -166,7 +167,7 @@ class DummyValidator implements ValidatorInterface
 
     public function validate($value, $constraints = null, $groups = null)
     {
-        return [$this->violation];
+        return new ConstraintViolationList([$this->violation]);
     }
 
     public function validateProperty($object, $propertyName, $groups = null)

src/Symfony/Component/Form/Tests/Fixtures/FooType.php

@@ -17,5 +17,6 @@ class FooType extends AbstractType
 {
     public function getParent()
     {
+        return null;
     }
 }

src/Symfony/Component/Security/Core/Encoder/EncoderAwareInterface.php

@@ -22,7 +22,7 @@ interface EncoderAwareInterface
      * If the method returns null, the standard way to retrieve the encoder
      * will be used instead.
      *
-     * @return string
+     * @return string|null
      */
     public function getEncoderName();
 }

src/Symfony/Component/Security/Core/User/User.php

@@ -69,6 +69,7 @@ final class User implements UserInterface, EquatableInterface, AdvancedUserInter
      */
     public function getSalt()
     {
+        return null;
     }
 
     /**