Merge branch '4.4'

* 4.4:
  fix merge
  fix merge

Author: nicolas-grekas

ConstraintViolation.php

@@ -32,20 +32,20 @@ class ConstraintViolation implements ConstraintViolationInterface
     /**
      * Creates a new constraint violation.
      *
-     * @param string      $message         The violation message as a string or a stringable object
-     * @param string      $messageTemplate The raw violation message
-     * @param array       $parameters      The parameters to substitute in the
+     * @param string|object $message         The violation message as a string or a stringable object
+     * @param string        $messageTemplate The raw violation message
+     * @param array         $parameters      The parameters to substitute in the
      *                                     raw violation message
-     * @param mixed       $root            The value originally passed to the
+     * @param mixed         $root            The value originally passed to the
      *                                     validator
-     * @param string      $propertyPath    The property path from the root
+     * @param string        $propertyPath    The property path from the root
      *                                     value to the invalid value
-     * @param mixed       $invalidValue    The invalid value that caused this
+     * @param mixed         $invalidValue    The invalid value that caused this
      *                                     violation
-     * @param int|null    $plural          The number for determining the plural
+     * @param int|null      $plural          The number for determining the plural
      *                                     form when translating the message
-     * @param string|null $code            The error code of the violation
-     * @param mixed       $cause           The cause of the violation
+     * @param string|null   $code            The error code of the violation
+     * @param mixed         $cause           The cause of the violation
      */
     public function __construct($message, ?string $messageTemplate, array $parameters, $root, ?string $propertyPath, $invalidValue, int $plural = null, string $code = null, Constraint $constraint = null, $cause = null)
     {

ConstraintViolationInterface.php

@@ -36,7 +36,7 @@ interface ConstraintViolationInterface
     /**
      * Returns the violation message.
      *
-     * @return string The violation message as a string or a stringable object
+     * @return string|object The violation message as a string or a stringable object
      */
     public function getMessage();
 

Context/ExecutionContextInterface.php

@@ -64,8 +64,8 @@ interface ExecutionContextInterface
     /**
      * Adds a violation at the current node of the validation graph.
      *
-     * @param string $message The error message as a string or a stringable object
-     * @param array  $params  The parameters substituted in the error message
+     * @param string|object $message The error message as a string or a stringable object
+     * @param array         $params  The parameters substituted in the error message
      */
     public function addViolation(string $message, array $params = []);
 
@@ -81,8 +81,8 @@ public function addViolation(string $message, array $params = []);
      *         ->setTranslationDomain('number_validation')
      *         ->addViolation();
      *
-     * @param string $message    The error message as a string or a stringable object
-     * @param array  $parameters The parameters substituted in the error message
+     * @param string|object $message    The error message as a string or a stringable object
+     * @param array         $parameters The parameters substituted in the error message
      *
      * @return ConstraintViolationBuilderInterface The violation builder
      */

Tests/ConstraintViolationTest.php

@@ -128,7 +128,7 @@ public function testMessageCanBeStringableObject()
     toString
 EOF;
         $this->assertSame($expected, (string) $violation);
-        $this->assertSame((string) $message, $violation->getMessage());
+        $this->assertSame($message, $violation->getMessage());
     }
 
     public function testMessageCannotBeArray()