Merge branch '4.4' into 5.2

derrabus · derrabus · commit 9e5b33c02090 · 2021-06-06T11:50:27.000+02:00
* 4.4:
  Fix incompatible implicit float-to-int conversions
  [Translation] Don't pass null to strtoupper()
  cs fix
  [DependencyInjection] Don't pass null to trim()
  Add return types to JsonSerializable implementations
  Fix Serializable deprecations triggered by token mocks
  Add missing security translations
diff --git a/Tests/JsonResponseTest.php b/Tests/JsonResponseTest.php
@@ -251,9 +251,6 @@ public function testSetContentJsonSerializeError()
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('This error is expected');
-        if (!interface_exists(\JsonSerializable::class, false)) {
-            $this->markTestSkipped('JsonSerializable is required.');
-        }
 
         $serializable = new JsonSerializableObject();
 
@@ -299,12 +296,10 @@ public function testConstructorWithObjectWithoutToStringMethodThrowsAnException(
     }
 }
 
-if (interface_exists(\JsonSerializable::class, false)) {
-    class JsonSerializableObject implements \JsonSerializable
+class JsonSerializableObject implements \JsonSerializable
+{
+    public function jsonSerialize(): array
     {
-        public function jsonSerialize()
-        {
-            throw new \Exception('This error is expected');
-        }
+        throw new \Exception('This error is expected');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -251,9 +251,6 @@ public function testSetContentJsonSerializeError()`
`251`	`251`	`{`
`252`	`252`	`$this->expectException(\Exception::class);`
`253`	`253`	`$this->expectExceptionMessage('This error is expected');`
`254`		`- if (!interface_exists(\JsonSerializable::class, false)) {`
`255`		`- $this->markTestSkipped('JsonSerializable is required.');`
`256`		`- }`
`257`	`254`
`258`	`255`	`$serializable = new JsonSerializableObject();`
`259`	`256`
`@@ -299,12 +296,10 @@ public function testConstructorWithObjectWithoutToStringMethodThrowsAnException(`
`299`	`296`	`}`
`300`	`297`	`}`
`301`	`298`
`302`		`-if (interface_exists(\JsonSerializable::class, false)) {`
`303`		`- class JsonSerializableObject implements \JsonSerializable`
	`299`	`+class JsonSerializableObject implements \JsonSerializable`
	`300`	`+{`
	`301`	`+ public function jsonSerialize(): array`
`304`	`302`	`{`
`305`		`- public function jsonSerialize()`
`306`		`- {`
`307`		`- throw new \Exception('This error is expected');`
`308`		`- }`
	`303`	`+ throw new \Exception('This error is expected');`
`309`	`304`	`}`
`310`	`305`	`}`