diff --git a/phpstan/baseline.neon b/phpstan/baseline.neon
index b7b5d0da2..ad2864c58 100644
--- a/phpstan/baseline.neon
+++ b/phpstan/baseline.neon
@@ -390,11 +390,6 @@ parameters:
 			count: 1
 			path: ../src/Composer/Command/DiagnoseCommand.php
 
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, string\\|null given\\.$#"
-			count: 1
-			path: ../src/Composer/Command/DiagnoseCommand.php
-
 		-
 			message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|false given\\.$#"
 			count: 1
@@ -405,11 +400,6 @@ parameters:
 			count: 1
 			path: ../src/Composer/Command/DiagnoseCommand.php
 
-		-
-			message: "#^Parameter \\#2 \\$subject of static method Composer\\\\Pcre\\\\Preg\\:\\:isMatch\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../src/Composer/Command/DiagnoseCommand.php
-
 		-
 			message: "#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#"
 			count: 3
@@ -495,11 +485,6 @@ parameters:
 			count: 1
 			path: ../src/Composer/Command/InitCommand.php
 
-		-
-			message: "#^Method Composer\\\\Command\\\\InitCommand\\:\\:getGitConfig\\(\\) should return array\\<string, string\\> but returns array\\<int\\|string, mixed\\>\\.$#"
-			count: 1
-			path: ../src/Composer/Command/InitCommand.php
-
 		-
 			message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"
 			count: 1
@@ -530,11 +515,6 @@ parameters:
 			count: 1
 			path: ../src/Composer/Command/InitCommand.php
 
-		-
-			message: "#^Property Composer\\\\Command\\\\InitCommand\\:\\:\\$gitConfig \\(array\\<string, string\\>\\) does not accept array\\<int\\|string, mixed\\>\\.$#"
-			count: 1
-			path: ../src/Composer/Command/InitCommand.php
-
 		-
 			message: "#^Right side of && is always false\\.$#"
 			count: 1
@@ -1790,11 +1770,6 @@ parameters:
 			count: 2
 			path: ../src/Composer/Downloader/GitDownloader.php
 
-		-
-			message: "#^Only booleans are allowed in a negated boolean, array\\<int, mixed\\> given\\.$#"
-			count: 1
-			path: ../src/Composer/Downloader/GitDownloader.php
-
 		-
 			message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"
 			count: 1
@@ -2365,11 +2340,6 @@ parameters:
 			count: 2
 			path: ../src/Composer/Installer.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: ../src/Composer/Installer/BinaryInstaller.php
-
 		-
 			message: "#^Only booleans are allowed in a negated boolean, array\\<string\\> given\\.$#"
 			count: 2
@@ -2407,7 +2377,7 @@ parameters:
 
 		-
 			message: "#^Parameter \\#2 \\$subject of static method Composer\\\\Pcre\\\\Preg\\:\\:isMatch\\(\\) expects string, string\\|false given\\.$#"
-			count: 2
+			count: 1
 			path: ../src/Composer/Installer/BinaryInstaller.php
 
 		-
@@ -3770,7 +3740,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 8
+			count: 6
 			path: ../src/Composer/Repository/Vcs/GitHubDriver.php
 
 		-
@@ -3865,7 +3835,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 7
+			count: 3
 			path: ../src/Composer/Repository/Vcs/GitLabDriver.php
 
 		-
@@ -3975,7 +3945,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
+			count: 1
 			path: ../src/Composer/Repository/Vcs/SvnDriver.php
 
 		-
@@ -4328,11 +4298,6 @@ parameters:
 			count: 2
 			path: ../src/Composer/Util/GitLab.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: ../src/Composer/Util/Hg.php
-
 		-
 			message: "#^Parameter \\#1 \\$str of function rawurlencode expects string, string\\|null given\\.$#"
 			count: 2
@@ -5263,16 +5228,6 @@ parameters:
 			count: 1
 			path: ../tests/Composer/Test/DependencyResolver/PoolBuilderTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$directory of class RecursiveDirectoryIterator constructor expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../tests/Composer/Test/DependencyResolver/PoolBuilderTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$fixturesDir of method Composer\\\\Test\\\\DependencyResolver\\\\PoolBuilderTest\\:\\:readTestFile\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../tests/Composer/Test/DependencyResolver/PoolBuilderTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$packageIds of method Composer\\\\Test\\\\DependencyResolver\\\\PoolBuilderTest\\:\\:getPackageResultSet\\(\\) expects array\\<int, Composer\\\\Package\\\\BasePackage\\>, array\\<int\\|string, Composer\\\\Package\\\\CompleteAliasPackage\\|Composer\\\\Package\\\\CompletePackage\\> given\\.$#"
 			count: 2
@@ -5293,16 +5248,6 @@ parameters:
 			count: 1
 			path: ../tests/Composer/Test/DependencyResolver/PoolOptimizerTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$directory of class RecursiveDirectoryIterator constructor expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../tests/Composer/Test/DependencyResolver/PoolOptimizerTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$fixturesDir of method Composer\\\\Test\\\\DependencyResolver\\\\PoolOptimizerTest\\:\\:readTestFile\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../tests/Composer/Test/DependencyResolver/PoolOptimizerTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$subject of static method Composer\\\\Pcre\\\\Preg\\:\\:split\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
@@ -5451,11 +5396,6 @@ parameters:
 			count: 2
 			path: ../tests/Composer/Test/InstallerTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$directory of class RecursiveDirectoryIterator constructor expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../tests/Composer/Test/InstallerTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false\\|null given\\.$#"
 			count: 1
@@ -5466,16 +5406,6 @@ parameters:
 			count: 1
 			path: ../tests/Composer/Test/InstallerTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$str of function strtr expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../tests/Composer/Test/InstallerTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$fixturesDir of method Composer\\\\Test\\\\InstallerTest\\:\\:readTestFile\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../tests/Composer/Test/InstallerTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$subject of static method Composer\\\\Pcre\\\\Preg\\:\\:split\\(\\) expects string, string\\|false given\\.$#"
 			count: 1