Merge 2.5 to fix phpstan (#3862)

* fix phpstan (#3859)

* Fix phpstan (#3861)

* Fix phpstan

* fix phpstan (#3859)

phpstan.neon.dist

@@ -86,17 +86,7 @@ parameters:
 		-
 			message: '#Call to method PHPUnit\\Framework\\Assert::assertSame\(\) with array\(.+\) and array\(.+\) will always evaluate to false\.#'
 			path: tests/Util/SortTraitTest.php
-		# https://github.com/phpstan/phpstan-symfony/issues/27
-		-
-			message: '#Service "api_platform\.json_schema\.schema_factory" is private\.#'
-			path: src/Bridge/Symfony/Bundle/Test/ApiTestAssertionsTrait.php
-		-
-			message: '#Service "api_platform\.iri_converter" is private\.#'
-			path: src/Bridge/Symfony/Bundle/Test/ApiTestCase.php
 		# https://github.com/phpstan/phpstan-symfony/issues/76
-		-
-			message: '#Service "api_platform\.graphql\.fields_builder" is private\.#'
-			path: src/GraphQl/Type/TypeBuilder.php
 		-
 			message: '#Service "test" is not registered in the container\.#'
 			path: tests/GraphQl/Type/TypesContainerTest.php