Merge pull request #9236 from weirdan/fix-cs-issues-2

vimeo · Feb 7, 2023 · 3584826 · 3584826
2 parents 93bc564 + 3c4a829
commit 3584826
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Algebra.php b/src/Psalm/Internal/Algebra.php
@@ -4,7 +4,6 @@
 
 use Psalm\Exception\ComplicatedExpressionException;
 use Psalm\Storage\Assertion;
-use Psalm\Storage\Assertion\Falsy;
 use UnexpectedValueException;
 
 use function array_filter;

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/AndAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/AndAnalyzer.php
@@ -153,7 +153,7 @@ public static function analyze(
 
         $partitioned_clauses = Context::removeReconciledClauses(
             [...$left_context->clauses, ...$left_clauses],
-            $changed_var_ids
+            $changed_var_ids,
         );
 
         $right_context->clauses = $partitioned_clauses[0];

diff --git a/tests/TypeReconciliation/TypeAlgebraTest.php b/tests/TypeReconciliation/TypeAlgebraTest.php
@@ -1226,7 +1226,7 @@ function foo(Base $base): void {
                                 echo $base->s;
                             }
                         }
-                    }'
+                    }',
             ],
             'subclassAfterElseifNegation' => [
                 'code' => '<?php
@@ -1243,7 +1243,7 @@ function foo(Base $base): void {
                         } elseif ($base instanceof B && rand(0, 1)) {
                             echo $base->s;
                         }
-                    }'
+                    }',
             ],
         ];
     }