Merge branch '4.4' into 5.3

derrabus · derrabus · commit bc1b5be82606 · 2021-08-05T00:42:42.000+02:00
* 4.4:
  Fix test
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -313,7 +313,7 @@ public function __construct(array $array)
         parent::__construct($array, 1);
     }
 
-    public function setFlags($flags)
+    public function setFlags($flags): void
     {
         throw new \BadMethodCallException('Calling MyArrayObject::setFlags() is forbidden');
     }
@@ -346,7 +346,7 @@ public function serialize(): string
         return serialize([123, parent::serialize()]);
     }
 
-    public function unserialize($data)
+    public function unserialize($data): void
     {
         if ('' === $data) {
             throw new \InvalidArgumentException('Serialized data is empty.');

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public function __construct(array $array)`
`313`	`313`	`parent::__construct($array, 1);`
`314`	`314`	`}`
`315`	`315`
`316`		`- public function setFlags($flags)`
	`316`	`+ public function setFlags($flags): void`
`317`	`317`	`{`
`318`	`318`	`throw new \BadMethodCallException('Calling MyArrayObject::setFlags() is forbidden');`
`319`	`319`	`}`
`@@ -346,7 +346,7 @@ public function serialize(): string`
`346`	`346`	`return serialize([123, parent::serialize()]);`
`347`	`347`	`}`
`348`	`348`
`349`		`- public function unserialize($data)`
	`349`	`+ public function unserialize($data): void`
`350`	`350`	`{`
`351`	`351`	`if ('' === $data) {`
`352`	`352`	`throw new \InvalidArgumentException('Serialized data is empty.');`