Merge pull request #203 from laminas/4.15.x-merge-up-into-4.16.x_j21Fn5ZC

Merge release 4.15.1 into 4.16.x

Author: gsteel

psalm-baseline.xml

@@ -591,10 +591,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>

src/Generator/TypeGenerator.php

@@ -69,7 +69,7 @@ public static function fromReflectionType(
 
         return new self(
             $atomicType,
-            $atomicType->type !== 'mixed' && $atomicType !== 'null' && $type->allowsNull()
+            $atomicType->type !== 'mixed' && $atomicType->type !== 'null' && $type->allowsNull()
         );
     }