Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions src/Analyser/NodeScopeResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -2090,6 +2090,18 @@ private function processStmtNode(
$throwPoints = array_merge($throwPoints, $exprResult->getThrowPoints());
$impurePoints = array_merge($impurePoints, $exprResult->getImpurePoints());
if ($var instanceof ArrayDimFetch && $var->dim !== null) {
$varType = $scope->getType($var->var);
if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
$throwPoints = array_merge($throwPoints, $this->processExprNode(
$stmt,
new MethodCall($this->deepNodeCloner->cloneNode($var->var), 'offsetUnset'),
$scope,
$storage,
new NoopNodeCallback(),
ExpressionContext::createDeep(),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the only occurrence where you still use a deep-context. intentional?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The $context is not an ExpressionContext but a StatementContext here, so I have to create a context (like it's done some line before)

)->getThrowPoints());
Comment on lines +2096 to +2103
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have similar but different code already in

$throwPoints = array_merge($throwPoints, $this->processExprNode(
$stmt,
new MethodCall($var, 'offsetSet'),
$scope,
$storage,
new NoopNodeCallback(),
$context,
)->getThrowPoints());

I wonder why

  • we need the cloning here
  • why we process a method call on $var->var and not $var
  • whether we need deep-context

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$var->var and not $var

The place $var is used we're doing

while ($var instanceof ArrayDimFetch) {
     $var = $var->var;

before

}

$clonedVar = $this->deepNodeCloner->cloneNode($var->var);
$traverser = new NodeTraverser();
$traverser->addVisitor(new class () extends NodeVisitorAbstract {
Expand Down Expand Up @@ -3612,6 +3624,18 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
$impurePoints = array_merge($impurePoints, $result->getImpurePoints());
$isAlwaysTerminating = $isAlwaysTerminating || $result->isAlwaysTerminating();
$scope = $result->getScope();

$varType = $scope->getType($expr->var);
if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
$throwPoints = array_merge($throwPoints, $this->processExprNode(
$stmt,
new MethodCall($this->deepNodeCloner->cloneNode($expr->var), 'offsetGet'),
$scope,
$storage,
new NoopNodeCallback(),
ExpressionContext::createDeep(),
)->getThrowPoints());
}
} elseif ($expr instanceof Array_) {
$itemNodes = [];
$hasYield = false;
Expand Down Expand Up @@ -3909,6 +3933,24 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
$impurePoints = array_merge($impurePoints, $result->getImpurePoints());
$isAlwaysTerminating = $isAlwaysTerminating || $result->isAlwaysTerminating();
$nonNullabilityResults[] = $nonNullabilityResult;

if (!($var instanceof ArrayDimFetch)) {
continue;
}

$varType = $scope->getType($var->var);
if ($varType->isArray()->yes() || (new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
continue;
}

$throwPoints = array_merge($throwPoints, $this->processExprNode(
$stmt,
new MethodCall($this->deepNodeCloner->cloneNode($var->var), 'offsetExists'),
$scope,
$storage,
new NoopNodeCallback(),
ExpressionContext::createDeep(),
)->getThrowPoints());
}
foreach (array_reverse($expr->vars) as $var) {
$scope = $this->lookForUnsetAllowedUndefinedExpressions($scope, $var);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,11 @@ public function testBug9267(): void
$this->analyse([__DIR__ . '/data/bug-9267.php'], []);
}

public function testBug11427(): void
{
$this->analyse([__DIR__ . '/data/bug-11427.php'], []);
}

#[RequiresPhp('>= 8.4')]
public function testPropertyHooks(): void
{
Expand Down
85 changes: 85 additions & 0 deletions tests/PHPStan/Rules/Exceptions/data/bug-11427.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?php

namespace Bug11427;

/** @implements \ArrayAccess<int, int> */
class C implements \ArrayAccess {
#[\ReturnTypeWillChange]
public function offsetExists($offset) {
throw new \Exception("exists");
}

#[\ReturnTypeWillChange]
public function offsetGet($offset) {
throw new \Exception("get");
}

#[\ReturnTypeWillChange]
public function offsetSet($offset, $value) {
throw new \Exception("set");
}

#[\ReturnTypeWillChange]
public function offsetUnset($offset) {
throw new \Exception("unset");
}
}

function test(C $c): void {
try {
$x = isset($c[1]);
} catch (\Exception $e) {
// offsetExists can throw
}

try {
$x = $c[1];
} catch (\Exception $e) {
// offsetGet can throw
}

try {
$c[1] = 1;
} catch (\Exception $e) {
// offsetSet can throw
}

try {
unset($c[1]);
} catch (\Exception $e) {
// offsetUnset can throw
}
}

/**
* Union type where isArray() returns maybe and isSuperTypeOf(ArrayAccess) returns maybe.
* This ensures the conditions in NodeScopeResolver are tested with types
* that distinguish !->yes() from ->no() and !->no() from ->yes().
*
* @param array<int, int>|C $c
*/
function testArrayOrArrayAccess($c): void {
try {
$x = isset($c[1]);
} catch (\Exception $e) {
// offsetExists can throw when $c is C
}

try {
$x = $c[1];
} catch (\Exception $e) {
// offsetGet can throw when $c is C
}

try {
$c[1] = 1;
} catch (\Exception $e) {
// offsetSet can throw when $c is C
}

try {
unset($c[1]);
} catch (\Exception $e) {
// offsetUnset can throw when $c is C
}
}
Loading