minor #41556 Add return types to JsonSerializable implementations (derrabus)

nicolas-grekas · nicolas-grekas · commit c127120b9ebf · 2021-06-06T10:43:31.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- Add return types to JsonSerializable implementations | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Part of #41552 | License | MIT | Doc PR | N/A PHP 8.1 will trigger a deprecation warning if we implement `JsonSerializable` without a return type. I've added return types to the two mock implementations that were affected. Commits ------- 9246b53 Add return types to JsonSerializable implementations
diff --git a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
@@ -224,9 +224,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();
 
@@ -280,12 +277,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');
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableDummy.php
@@ -13,7 +13,7 @@
 
 class JsonSerializableDummy implements \JsonSerializable
 {
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'foo' => 'a',

Original file line number	Diff line number	Diff line change
`@@ -224,9 +224,6 @@ public function testSetContentJsonSerializeError()`
`224`	`224`	`{`
`225`	`225`	`$this->expectException(\Exception::class);`
`226`	`226`	`$this->expectExceptionMessage('This error is expected');`
`227`		`- if (!interface_exists(\JsonSerializable::class, false)) {`
`228`		`- $this->markTestSkipped('JsonSerializable is required.');`
`229`		`- }`
`230`	`227`
`231`	`228`	`$serializable = new JsonSerializableObject();`
`232`	`229`
`@@ -280,12 +277,10 @@ public function testConstructorWithObjectWithoutToStringMethodThrowsAnException(`
`280`	`277`	`}`
`281`	`278`	`}`
`282`	`279`
`283`		`-if (interface_exists(\JsonSerializable::class, false)) {`
`284`		`- class JsonSerializableObject implements \JsonSerializable`
	`280`	`+class JsonSerializableObject implements \JsonSerializable`
	`281`	`+{`
	`282`	`+ public function jsonSerialize(): array`
`285`	`283`	`{`
`286`		`- public function jsonSerialize()`
`287`		`- {`
`288`		`- throw new \Exception('This error is expected');`
`289`		`- }`
	`284`	`+ throw new \Exception('This error is expected');`
`290`	`285`	`}`
`291`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`class JsonSerializableDummy implements \JsonSerializable`
`15`	`15`	`{`
`16`		`- public function jsonSerialize()`
	`16`	`+ public function jsonSerialize(): array`
`17`	`17`	`{`
`18`	`18`	`return [`
`19`	`19`	`'foo' => 'a',`