Fixed tests on the Security and Form components

derrabus · nicolas-grekas · commit c46dbe00cdcc · 2019-08-21T16:43:32.000+02:00
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
@@ -26,6 +26,7 @@
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationInterface;
+use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Mapping\MetadataInterface;
@@ -169,7 +170,7 @@ public function hasMetadataFor($value): bool
 
     public function validate($value, $constraints = null, $groups = null): ConstraintViolationListInterface
     {
-        return [$this->violation];
+        return new ConstraintViolationList([$this->violation]);
     }
 
     public function validateProperty($object, $propertyName, $groups = null): ConstraintViolationListInterface
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FooType.php b/src/Symfony/Component/Form/Tests/Fixtures/FooType.php
@@ -17,5 +17,6 @@ class FooType extends AbstractType
 {
     public function getParent(): ?string
     {
+        return null;
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Encoder/EncoderAwareInterface.php b/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();
 }
diff --git a/src/Symfony/Component/Security/Core/Security.php b/src/Symfony/Component/Security/Core/Security.php
@@ -34,7 +34,10 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    public function getUser(): ?UserInterface
+    /**
+     * @return UserInterface|null
+     */
+    public function getUser()
     {
         if (!$token = $this->getToken()) {
             return null;
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
@@ -164,7 +164,7 @@ class EncAwareUser extends SomeUser implements EncoderAwareInterface
 {
     public $encoderName = 'encoder_name';
 
-    public function getEncoderName(): string
+    public function getEncoderName(): ?string
     {
         return $this->encoderName;
     }
diff --git a/src/Symfony/Component/Security/Core/User/User.php b/src/Symfony/Component/Security/Core/User/User.php
@@ -71,6 +71,7 @@ public function getPassword(): ?string
      */
     public function getSalt(): ?string
     {
+        return null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`use Symfony\Component\Form\FormFactoryInterface;`
`27`	`27`	`use Symfony\Component\Validator\ConstraintViolation;`
`28`	`28`	`use Symfony\Component\Validator\ConstraintViolationInterface;`
	`29`	`+use Symfony\Component\Validator\ConstraintViolationList;`
`29`	`30`	`use Symfony\Component\Validator\ConstraintViolationListInterface;`
`30`	`31`	`use Symfony\Component\Validator\Context\ExecutionContextInterface;`
`31`	`32`	`use Symfony\Component\Validator\Mapping\MetadataInterface;`
`@@ -169,7 +170,7 @@ public function hasMetadataFor($value): bool`
`169`	`170`
`170`	`171`	`public function validate($value, $constraints = null, $groups = null): ConstraintViolationListInterface`
`171`	`172`	`{`
`172`		`- return [$this->violation];`
	`173`	`+ return new ConstraintViolationList([$this->violation]);`
`173`	`174`	`}`
`174`	`175`
`175`	`176`	`public function validateProperty($object, $propertyName, $groups = null): ConstraintViolationListInterface`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@ class FooType extends AbstractType`
`17`	`17`	`{`
`18`	`18`	`public function getParent(): ?string`
`19`	`19`	`{`
	`20`	`+ return null;`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ interface EncoderAwareInterface`
`22`	`22`	`* If the method returns null, the standard way to retrieve the encoder`
`23`	`23`	`* will be used instead.`
`24`	`24`	`*`
`25`		`- * @return string`
	`25`	`+ * @return string\|null`
`26`	`26`	`*/`
`27`	`27`	`public function getEncoderName();`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,10 @@ public function __construct(ContainerInterface $container)`
`34`	`34`	`$this->container = $container;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function getUser(): ?UserInterface`
	`37`	`+ /**`
	`38`	`+ * @return UserInterface\|null`
	`39`	`+ */`
	`40`	`+ public function getUser()`
`38`	`41`	`{`
`39`	`42`	`if (!$token = $this->getToken()) {`
`40`	`43`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ class EncAwareUser extends SomeUser implements EncoderAwareInterface`
`164`	`164`	`{`
`165`	`165`	`public $encoderName = 'encoder_name';`
`166`	`166`
`167`		`- public function getEncoderName(): string`
	`167`	`+ public function getEncoderName(): ?string`
`168`	`168`	`{`
`169`	`169`	`return $this->encoderName;`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public function getPassword(): ?string`
`71`	`71`	`*/`
`72`	`72`	`public function getSalt(): ?string`
`73`	`73`	`{`
	`74`	`+ return null;`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`/**`