diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index fd3a5acbca..2228034866 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,7 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$input of function str_pad expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function str_pad expects string, int given\\.$#"
 			count: 1
 			path: src/Faker/Calculator/Iban.php
 
@@ -635,7 +635,7 @@ parameters:
 			path: src/Faker/Provider/Base.php
 
 		-
-			message: "#^Parameter \\#1 \\$input of function str_pad expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function str_pad expects string, int given\\.$#"
 			count: 1
 			path: src/Faker/Provider/Base.php
 
@@ -665,12 +665,12 @@ parameters:
 			path: src/Faker/Provider/File.php
 
 		-
-			message: "#^Parameter \\#1 \\$str of function md5 expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function md5 expects string, int given\\.$#"
 			count: 1
 			path: src/Faker/Provider/Miscellaneous.php
 
 		-
-			message: "#^Parameter \\#1 \\$str of function sha1 expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function sha1 expects string, int given\\.$#"
 			count: 1
 			path: src/Faker/Provider/Miscellaneous.php
 
@@ -705,7 +705,7 @@ parameters:
 			path: src/Faker/Provider/cs_CZ/Person.php
 
 		-
-			message: "#^Parameter \\#1 \\$input of function str_pad expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function str_pad expects string, int given\\.$#"
 			count: 1
 			path: src/Faker/Provider/en_ZA/Person.php
 
@@ -780,7 +780,7 @@ parameters:
 			path: src/Faker/Provider/ro_RO/Person.php
 
 		-
-			message: "#^Parameter \\#1 \\$input of function str_pad expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function str_pad expects string, int given\\.$#"
 			count: 1
 			path: src/Faker/Provider/ru_RU/Company.php
 
@@ -790,7 +790,7 @@ parameters:
 			path: src/Faker/Provider/sl_SI/Person.php
 
 		-
-			message: "#^Parameter \\#1 \\$input of function str_pad expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function str_pad expects string, int given\\.$#"
 			count: 1
 			path: src/Faker/Provider/zh_CN/Address.php
 
@@ -800,7 +800,7 @@ parameters:
 			path: src/Faker/Provider/zh_CN/Address.php
 
 		-
-			message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, Closure\\(mixed\\)\\: bool given\\.$#"
+			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, Closure\\(mixed\\)\\: bool given\\.$#"
 			count: 1
 			path: src/autoload.php
 
diff --git a/psalm.baseline.xml b/psalm.baseline.xml
index 7d5b26835d..29cc2eceda 100644
--- a/psalm.baseline.xml
+++ b/psalm.baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.17.0@6f4707aa41c9174353a6434bba3fc8840f981d9c">
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
   <file src="src/Faker/Calculator/Luhn.php">
     <InvalidReturnStatement occurrences="1">
       <code>0</code>