Merge pull request #6306 from orklah/misc6

Change > assertion back to @ and put back a perf threshold
vimeo · Aug 15, 2021 · 1a7a44a · 1a7a44a
2 parents 4c26293 + 1e17069
commit 1a7a44a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Algebra.php b/src/Psalm/Internal/Algebra.php
@@ -456,6 +456,10 @@ public static function combineOredClauses(
         array $right_clauses,
         int $conditional_object_id
     ): array {
+        if (count($left_clauses) > 60000 || count($right_clauses) > 60000) {
+            return [];
+        }
+
         $clauses = [];
 
         $all_wedges = true;

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -93,7 +93,7 @@ public static function scrapeAssertions(
 
             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']];
                 }

diff --git a/src/Psalm/Internal/Type/AssertionReconciler.php b/src/Psalm/Internal/Type/AssertionReconciler.php
@@ -86,7 +86,7 @@ public static function reconcile(
 
         $original_assertion = $assertion;
 
-        if ($assertion[0] === '>') {
+        if ($assertion[0] === '@') {
             $assertion = 'falsy';
             $is_negation = true;
         }

diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
@@ -162,9 +162,9 @@ public static function reconcileKeyedTypes(
                 $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;