8000 Merge branch '2.7' into 2.8 · symfony/security-core@4a33924 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4a33924

Browse files
committed
Merge branch '2.7' into 2.8
Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents fe061f9 + 433a7b8 commit 4a33924

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Encoder/EncoderFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function testGetNullNamedEncoderForEncoderAware()
107107
}
108108

109109
/**
110-
* @expectedException RuntimeException
110+
* @expectedException \RuntimeException
111111
*/
112112
public function testGetInvalidNamedEncoderForEncoderAware()
113113
{

0 commit comments

Comments
 (0)
0