Skip to content

Commit 8239402

Browse files
Merge branch '4.3' into 4.4
* 4.3: (23 commits) fix merge [SecurityBundle] fix return type declarations [BrowserKit] fix return type declarations [PropertyInfo] fix return type declarations [Bridge/Doctrine] fix return type declarations [Form] fix return type declarations [Console] fix return type declarations [Intl] fix return type declarations [Templating] fix return type declarations [DomCrawler] fix return type declarations [Validator] fix return type declarations [Process] fix return type declarations [Workflow] fix return type declarations [Cache] fix return type declarations [Serializer] fix return type declarations [Translation] fix return type declarations [DI] fix return type declarations [Config] fix return type declarations [HttpKernel] Fix return type declarations [Security] Fix return type declarations ...
2 parents 95b6690 + 55f1c26 commit 8239402

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Context/ExecutionContextInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public function getMetadata();
280280
/**
281281
* Returns the validation group that is currently being validated.
282282
*
283-
* @return string The current validation group
283+
* @return string|null The current validation group
284284
*/
285285
public function getGroup();
286286

Tests/ConstraintViolationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function testMessageCanBeStringableObject()
128128
toString
129129
EOF;
130130
$this->assertSame($expected, (string) $violation);
131-
$this->assertSame($message, $violation->getMessage());
131+
$this->assertSame((string) $message, $violation->getMessage());
132132
}
133133

134134
public function testMessageCannotBeArray()

0 commit comments

Comments
 (0)