Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 2984ab7e4e39 · 2019-08-21T17:03:51.000+02:00
* 4.3:
  Do not extend the new SF 4.3 ControllerEvent so we can make it final
  Backported return type violation bugfixes.
  [FrameworkBundle] Fix BrowserKit assertions to make them compatible with Panther
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\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -166,7 +167,7 @@ public function hasMetadataFor($value)
 
     public function validate($value, $constraints = null, $groups = null)
     {
-        return [$this->violation];
+        return new ConstraintViolationList([$this->violation]);
     }
 
     public function validateProperty($object, $propertyName, $groups = null)
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()
     {
+        return null;
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Event/FilterControllerArgumentsEvent.php b/src/Symfony/Component/HttpKernel/Event/FilterControllerArgumentsEvent.php
@@ -17,7 +17,7 @@
 /**
  * @deprecated since Symfony 4.3, use ControllerArgumentsEvent instead
  */
-class FilterControllerArgumentsEvent extends ControllerEvent
+class FilterControllerArgumentsEvent extends FilterControllerEvent
 {
     private $arguments;
 
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
@@ -24,6 +24,9 @@
         "egulias/email-validator": "^2.0",
         "symfony/dependency-injection": "^3.4|^4.1|^5.0"
     },
+    "conflict": {
+        "symfony/mailer": "<4.4"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Mime\\": "" },
         "exclude-from-classmap": [
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/User/User.php b/src/Symfony/Component/Security/Core/User/User.php
@@ -71,6 +71,7 @@ public function getPassword()
      */
     public function getSalt()
     {
+        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\Context\ExecutionContextInterface;`
`30`	`31`	`use Symfony\Component\Validator\Validation;`
`31`	`32`	`use Symfony\Component\Validator\Validator\ValidatorInterface;`
`@@ -166,7 +167,7 @@ public function hasMetadataFor($value)`
`166`	`167`
`167`	`168`	`public function validate($value, $constraints = null, $groups = null)`
`168`	`169`	`{`
`169`		`- return [$this->violation];`
	`170`	`+ return new ConstraintViolationList([$this->violation]);`
`170`	`171`	`}`
`171`	`172`
`172`	`173`	`public function validateProperty($object, $propertyName, $groups = null)`
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()`
`19`	`19`	`{`
	`20`	`+ return null;`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* @deprecated since Symfony 4.3, use ControllerArgumentsEvent instead`
`19`	`19`	`*/`
`20`		`-class FilterControllerArgumentsEvent extends ControllerEvent`
	`20`	`+class FilterControllerArgumentsEvent extends FilterControllerEvent`
`21`	`21`	`{`
`22`	`22`	`private $arguments;`
`23`	`23`
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
`@@ -71,6 +71,7 @@ public function getPassword()`
`71`	`71`	`*/`
`72`	`72`	`public function getSalt()`
`73`	`73`	`{`
	`74`	`+ return null;`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`/**`