Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 447178f7f1fb · 2021-08-18T10:22:40.000+02:00
* 5.4:
  cs fix
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -621,10 +621,6 @@ class NotSerializable
 {
     public function __sleep(): array
     {
-        if (class_exists(\Error::class)) {
-            throw new \Error('not serializable');
-        }
-
-        throw new \Exception('not serializable');
+        throw new \Error('not serializable');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -621,10 +621,6 @@ class NotSerializable`
`621`	`621`	`{`
`622`	`622`	`public function __sleep(): array`
`623`	`623`	`{`
`624`		`- if (class_exists(\Error::class)) {`
`625`		`- throw new \Error('not serializable');`
`626`		`- }`
`627`		`-`
`628`		`- throw new \Exception('not serializable');`
	`624`	`+ throw new \Error('not serializable');`
`629`	`625`	`}`
`630`	`626`	`}`