diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 3036a1db..42ea5350 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.9.0@8b9ad1eb9e8b7d3101f949291da2b9f7767cd163">
   <file src="src/DeclareStatement.php">
     <MixedArgumentTypeCoercion>
       <code>$directive</code>
@@ -110,9 +110,6 @@
     <PossiblyFalseOperand>
       <code><![CDATA[strrpos($name, '\\')]]></code>
     </PossiblyFalseOperand>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[str_replace(['.', '-', '_'], '', $name)]]></code>
-    </PossiblyInvalidArgument>
     <PossiblyNullOperand>
       <code>$namespaceAlias</code>
     </PossiblyNullOperand>
@@ -245,9 +242,6 @@
       <code><![CDATA[$this->tags]]></code>
       <code>TagInterface[]</code>
     </MixedReturnTypeCoercion>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[str_replace(['.', '-', '_'], '', $name)]]></code>
-    </PossiblyInvalidArgument>
     <RedundantCastGivenDocblockType>
       <code>(bool) $value</code>
     </RedundantCastGivenDocblockType>
@@ -307,9 +301,6 @@
     <MoreSpecificReturnType>
       <code><![CDATA[array<int, array{string, null|string, false|null|string}>]]></code>
     </MoreSpecificReturnType>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[str_replace(['.', '-', '_'], '', $name)]]></code>
-    </PossiblyInvalidArgument>
     <PossiblyNullArgument>
       <code>current($use)</code>
     </PossiblyNullArgument>
@@ -357,9 +348,6 @@
       <code>$value</code>
       <code>$value</code>
     </MixedAssignment>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[str_replace(['.', '-', '_'], '', $name)]]></code>
-    </PossiblyInvalidArgument>
     <UnsafeInstantiation>
       <code><![CDATA[new static($array['name'])]]></code>
       <code><![CDATA[new static($classReflection->getName())]]></code>
@@ -398,9 +386,6 @@
     <PossiblyFalseArgument>
       <code><![CDATA[$reflectionMethod->getDocBlock()]]></code>
     </PossiblyFalseArgument>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[str_replace(['.', '-', '_'], '', $name)]]></code>
-    </PossiblyInvalidArgument>
     <RedundantCastGivenDocblockType>
       <code>(bool) $returnsReference</code>
     </RedundantCastGivenDocblockType>
@@ -429,9 +414,6 @@
     <MixedAssignment>
       <code>$value</code>
     </MixedAssignment>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[str_replace(['.', '-', '_'], '', $name)]]></code>
-    </PossiblyInvalidArgument>
     <RedundantCastGivenDocblockType>
       <code>(bool) $passedByReference</code>
       <code>(bool) $variadic</code>
@@ -466,9 +448,6 @@
     <MixedAssignment>
       <code>$defaultValue</code>
     </MixedAssignment>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[str_replace(['.', '-', '_'], '', $name)]]></code>
-    </PossiblyInvalidArgument>
     <PossiblyUnusedProperty>
       <code>$isConst</code>
     </PossiblyUnusedProperty>
@@ -501,9 +480,6 @@
     <PossiblyFalseArgument>
       <code><![CDATA[$classReflection->getDocBlock()]]></code>
     </PossiblyFalseArgument>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[str_replace(['.', '-', '_'], '', $name)]]></code>
-    </PossiblyInvalidArgument>
     <UnsafeInstantiation>
       <code><![CDATA[new static($array['name'])]]></code>
       <code><![CDATA[new static($classReflection->getName())]]></code>
@@ -591,10 +567,6 @@
     <InvalidArgument>
       <code>$type</code>
     </InvalidArgument>
-    <RedundantCondition>
-      <code><![CDATA[$atomicType !== 'null']]></code>
-      <code><![CDATA[$atomicType->type !== 'mixed' && $atomicType !== 'null']]></code>
-    </RedundantCondition>
     <RedundantConditionGivenDocblockType>
       <code>$type instanceof ReflectionNamedType</code>
     </RedundantConditionGivenDocblockType>
@@ -1125,19 +1097,12 @@
     </UnusedVariable>
   </file>
   <file src="test/Generator/AbstractGeneratorTest.php">
-    <DeprecatedMethod>
-      <code>getMockForAbstractClass</code>
-      <code>getMockForAbstractClass</code>
-    </DeprecatedMethod>
     <MissingReturnType>
       <code>testConstructor</code>
       <code>testSetOptionsThrowsExceptionOnInvalidArgument</code>
     </MissingReturnType>
   </file>
   <file src="test/Generator/AbstractMemberGeneratorTest.php">
-    <DeprecatedMethod>
-      <code>getMockForAbstractClass</code>
-    </DeprecatedMethod>
     <InvalidArgument>
       <code>new stdClass()</code>
     </InvalidArgument>
@@ -1448,9 +1413,6 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="test/Generator/FileGeneratorTest.php">
-    <ArgumentTypeCoercion>
-      <code><![CDATA[$file->getUses()]]></code>
-    </ArgumentTypeCoercion>
     <DeprecatedMethod>
       <code><![CDATA[FileGenerator::fromArray([
             'class' => [
@@ -1519,6 +1481,9 @@
             ],
         ])]]></code>
     </DeprecatedMethod>
+    <InvalidArgument>
+      <code><![CDATA[$file->getUses()]]></code>
+    </InvalidArgument>
     <MissingReturnType>
       <code>testClassNotFoundException</code>
       <code>testConstruction</code>
@@ -1729,7 +1694,6 @@
   <file src="test/Generator/PropertyGeneratorTest.php">
     <ArgumentTypeCoercion>
       <code>$type</code>
-      <code><![CDATA[__NAMESPACE__ . '\\' . $className]]></code>
     </ArgumentTypeCoercion>
     <DeprecatedMethod>
       <code><![CDATA[PropertyGenerator::fromArray([
@@ -2059,6 +2023,9 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="test/Reflection/FunctionReflectionTest.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[__NAMESPACE__ . '\\' . $functionName]]></code>
+    </ArgumentTypeCoercion>
     <DeprecatedMethod>
       <code>getPrototype</code>
       <code>getPrototype</code>