diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4'

Browse Source 
* 4.4:
  fix merge
  fix merge
This commit is contained in:
Nicolas Grekas 2019-08-26 11:33:24 +02:00
commit 8a5d937de2
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Symfony/Component/Validator/ConstraintViolation.php
View File

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

2
src/Symfony/Component/Validator/ConstraintViolationInterface.php
View File

@ -36,7 +36,7 @@ interface ConstraintViolationInterface
/** /**
* Returns the violation message. * 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(); public function getMessage();

8
src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
View File

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

2
src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php
View File

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