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

Merge pull request #6306 from orklah/misc6

Browse Source 
Change > assertion back to @ and put back a perf threshold
This commit is contained in:
Bruce Weirdan 2021-08-15 22:56:34 +03:00 committed by GitHub
commit 1a7a44a602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Algebra.php
View File

@ -456,6 +456,10 @@ class Algebra
array $right_clauses,
int $conditional_object_id
): array {
if (count($left_clauses) > 60000 || count($right_clauses) > 60000) {
return [];
}
$clauses = [];
$all_wedges = true;

2
src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
View File

@ -93,7 +93,7 @@ class AssertionFinder
if ($var_name) {
if ($candidate_if_types) {
$if_types[$var_name] = [['>' . \json_encode($candidate_if_types[0])]];
$if_types[$var_name] = [['@' . \json_encode($candidate_if_types[0])]];
} else {
$if_types[$var_name] = [['!falsy']];
}

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

@ -86,7 +86,7 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$original_assertion = $assertion;
if ($assertion[0] === '>') {
if ($assertion[0] === '@') {
$assertion = 'falsy';
$is_negation = true;
}

4
src/Psalm/Type/Reconciler.php
View File

@ -162,9 +162,9 @@ class Reconciler
$orred_type = null;
foreach ($new_type_part_parts as $new_type_part_part) {
if ($new_type_part_part[0] === '>'
if ($new_type_part_part[0] === '@'
|| ($new_type_part_part[0] === '!'
&& $new_type_part_part[1] === '>')
&& $new_type_part_part[1] === '@')
) {
if ($new_type_part_part[0] === '!') {
$nested_negated = !$negated;