danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-04 10:38:49 +01:00
Code Issues Projects Releases Wiki Activity

Remove commas for now

Browse Source
This commit is contained in:
Matthew Brown 2022-01-04 23:15:16 +00:00
parent 9e64375e25
commit 0a78b320da
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Type/AssertionReconciler.php
View File

@ -634,7 +634,7 @@ class AssertionReconciler extends Reconciler
Codebase $codebase, Codebase $codebase,
array $template_type_map, array $template_type_map,
bool &$has_local_match, bool &$has_local_match,
bool &$any_scalar_type_match_found, bool &$any_scalar_type_match_found
): ?Atomic { ): ?Atomic {
if ($existing_type_part instanceof TFloat if ($existing_type_part instanceof TFloat
&& $new_type_part instanceof TInt && $new_type_part instanceof TInt

2
src/Psalm/Type.php
View File

@ -662,7 +662,7 @@ abstract class Type
Atomic $type_1_atomic, Atomic $type_1_atomic,
Atomic $type_2_atomic, Atomic $type_2_atomic,
Codebase $codebase, Codebase $codebase,
bool &$intersection_performed, bool &$intersection_performed
): ?Atomic { ): ?Atomic {
$intersection_atomic = null; $intersection_atomic = null;
$wider_type = null; $wider_type = null;