Merge branch '4.3' into 4.4
* 4.3: fix merge fix merge
This commit is contained in:
commit
123fc624e5
@ -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, $code = null, Constraint $constraint = null, $cause = null)
|
||||
{
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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($message, array $params = []);
|
||||
|
||||
@ -81,8 +81,8 @@ interface ExecutionContextInterface
|
||||
* ->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
|
||||
*/
|
||||
|
@ -128,7 +128,7 @@ Root.property.path:
|
||||
toString
|
||||
EOF;
|
||||
$this->assertSame($expected, (string) $violation);
|
||||
$this->assertSame((string) $message, $violation->getMessage());
|
||||
$this->assertSame($message, $violation->getMessage());
|
||||
}
|
||||
|
||||
public function testMessageCannotBeArray()
|
||||
|
@ -45,7 +45,7 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
|
||||
private $cause;
|
||||
|
||||
/**
|
||||
* @param string $message The error message as a string or a stringable object
|
||||
* @param string|object $message The error message as a string or a stringable object
|
||||
* @param TranslatorInterface $translator
|
||||
*/
|
||||
public function __construct(ConstraintViolationList $violations, Constraint $constraint, $message, array $parameters, $root, string $propertyPath, $invalidValue, $translator, string $translationDomain = null)
|
||||
|
Reference in New Issue
Block a user