Merge branch 'main' of github.com:dedoc/documentor

dedoc · May 14, 2024 · 1a8aff1 · 1a8aff1
2 parents 2753026 + 7d87f52
commit 1a8aff1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Infer/Scope/Scope.php b/src/Infer/Scope/Scope.php
@@ -55,7 +55,7 @@ public function getType(Node $node): Type
 
  if ($node instanceof Node\Expr\Ternary) {
  return Union::wrap([
- $this->getType($node->if),
+ $this->getType($node->if ?? $node->cond),
  $this->getType($node->else),
  ]);
  }

diff --git a/tests/Infer/Scope/ScopeTest.php b/tests/Infer/Scope/ScopeTest.php
@@ -17,4 +17,12 @@ function getStatementTypeForScopeTest(string $statement, array $extensions = [])
 })->with([
  ['unknown() ? 1 : null', 'int(1)|null'],
  ['unknown() ? 1 : 1', 'int(1)'],
+ ['unknown() ?: 1', 'unknown|int(1)'],
+ ['(int) unknown() ?: 1', 'int|int(1)'],
+ ['1 ?: 1', 'int(1)'],
+ ['unknown() ? 1 : unknown()', 'int(1)|unknown'],
+ ['unknown() ? unknown() : unknown()', 'unknown'],
+ ['unknown() ?: unknown()', 'unknown'],
+ ['unknown() ?: true ?: 1', 'unknown|boolean(true)|int(1)'],
+ ['unknown() ?: unknown() ?: unknown()', 'unknown'],
 ]);