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

gsteel · web-flow · commit c3d187b5c1e7 · 2024-10-25T11:24:39.000+01:00
Merge release 4.15.1 into 4.16.x
diff --git a/psalm-baseline.xml b/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>
diff --git a/src/Generator/TypeGenerator.php b/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()
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static function fromReflectionType(`
`69`	`69`
`70`	`70`	`return new self(`
`71`	`71`	`$atomicType,`
`72`		`- $atomicType->type !== 'mixed' && $atomicType !== 'null' && $type->allowsNull()`
	`72`	`+ $atomicType->type !== 'mixed' && $atomicType->type !== 'null' && $type->allowsNull()`
`73`	`73`	`);`
`74`	`74`	`}`
`75`	`75`