Conflicts resolved

Author: Spomky

phpstan-baseline.neon

@@ -920,11 +920,6 @@ parameters:
 			count: 1
 			path: src/Bundle/Serializer/JWESerializer.php
 
-		-
-			message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Serializer\\\\JWESerializer\\:\\:getSupportedTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Bundle/Serializer/JWESerializer.php
-
 		-
 			message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Serializer\\\\JWESerializer\\:\\:supportsDenormalization\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -960,11 +955,6 @@ parameters:
 			count: 1
 			path: src/Bundle/Serializer/JWSSerializer.php
 
-		-
-			message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Serializer\\\\JWSSerializer\\:\\:getSupportedTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Bundle/Serializer/JWSSerializer.php
-
 		-
 			message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Serializer\\\\JWSSerializer\\:\\:supportsDenormalization\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
 			count: 1