Skip to content

Commit e2ddb3a

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: (26 commits) fixed CS fixed CS fixed CS fixer config fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [PropertyInfo] Don't try to access a property thru a static method [PropertyInfo] Exclude static methods form properties guessing [FrameworkBundle] Fix third level headers for MarkdownDescriptor [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings CS: apply is_null DX: remove invalid inheritdoc bumped Symfony version to 2.8.17 updated VERSION for 2.8.16 ...
2 parents 16f167b + 664e6b7 commit e2ddb3a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Encoder/JsonDecodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function decodeProvider()
6161
*/
6262
public function testDecodeWithException($value)
6363
{
64-
$this->decode->decode($value, JsonEncoder::FORMAT);
64+
$this->decode->decode($value, JsonEncoder::FORMAT);
6565
}
6666

6767
public function decodeProviderException()

Tests/Encoder/JsonEncodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ public function encodeProvider()
5454
*/
5555
public function testEncodeWithError()
5656
{
57-
$this->encode->encode("\xB1\x31", JsonEncoder::FORMAT);
57+
$this->encode->encode("\xB1\x31", JsonEncoder::FORMAT);
5858
}
5959
}

0 commit comments

Comments
 (0)