Skip to content

Commit 59ebbf0

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: expectedException expects FQCN Fixed expectedException annotations Security and validators messages translation to Latvian [Form] FormView->isRendered() remove dead code and simplify the flow
2 parents 81674b4 + fad6992 commit 59ebbf0

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Tests/Encoder/ChainDecoderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testDecode()
6868
}
6969

7070
/**
71-
* @expectedException Symfony\Component\Serializer\Exception\RuntimeException
71+
* @expectedException \Symfony\Component\Serializer\Exception\RuntimeException
7272
*/
7373
public function testDecodeUnsupportedFormat()
7474
{

Tests/Encoder/ChainEncoderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testEncode()
6969
}
7070

7171
/**
72-
* @expectedException Symfony\Component\Serializer\Exception\RuntimeException
72+
* @expectedException \Symfony\Component\Serializer\Exception\RuntimeException
7373
*/
7474
public function testEncodeUnsupportedFormat()
7575
{

Tests/Encoder/JsonDecodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function decodeProvider()
5757
/**
5858
* @requires function json_last_error_msg
5959
* @dataProvider decodeProviderException
60-
* @expectedException Symfony\Component\Serializer\Exception\UnexpectedValueException
60+
* @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
6161
*/
6262
public function testDecodeWithException($value)
6363
{

Tests/Encoder/JsonEncodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function encodeProvider()
5050

5151
/**
5252
* @requires function json_last_error_msg
53-
* @expectedException Symfony\Component\Serializer\Exception\UnexpectedValueException
53+
* @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
5454
*/
5555
public function testEncodeWithError()
5656
{

0 commit comments

Comments
 (0)