Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
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
12 changes: 7 additions & 5 deletions src/Analyser/NodeScopeResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -5392,6 +5392,7 @@ private function processAssignVar(
}
}

$scopeBeforeAssignEval = $scope;
$scope = $result->getScope();
$truthySpecifiedTypes = $this->typeSpecifier->specifyTypesInCondition($scope, $assignedExpr, TypeSpecifierContext::createTruthy());
$falseySpecifiedTypes = $this->typeSpecifier->specifyTypesInCondition($scope, $assignedExpr, TypeSpecifierContext::createFalsey());
Expand All @@ -5404,7 +5405,7 @@ private function processAssignVar(
$conditionalExpressions = $this->processSureTypesForConditionalExpressionsAfterAssign($scope, $var->name, $conditionalExpressions, $falseySpecifiedTypes, $falseyType);
$conditionalExpressions = $this->processSureNotTypesForConditionalExpressionsAfterAssign($scope, $var->name, $conditionalExpressions, $falseySpecifiedTypes, $falseyType);

$nodeCallback(new VariableAssignNode($var, $assignedExpr), $result->getScope());
$nodeCallback(new VariableAssignNode($var, $assignedExpr), $scopeBeforeAssignEval);
$scope = $scope->assignVariable($var->name, $type, $scope->getNativeType($assignedExpr), TrinaryLogic::createYes());
foreach ($conditionalExpressions as $exprString => $holders) {
$scope = $scope->addConditionalExpressions($exprString, $holders);
Expand Down Expand Up @@ -5487,6 +5488,7 @@ private function processAssignVar(
$nativeValueToWrite = $scope->getNativeType($assignedExpr);
$originalValueToWrite = $valueToWrite;
$originalNativeValueToWrite = $nativeValueToWrite;
$scopeBeforeAssignEval = $scope;

// 3. eval assigned expr
$result = $processExprCallback($scope);
Expand Down Expand Up @@ -5542,11 +5544,11 @@ private function processAssignVar(

if ($varType->isArray()->yes() || !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->yes()) {
if ($var instanceof Variable && is_string($var->name)) {
$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scope);
$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scopeBeforeAssignEval);
$scope = $scope->assignVariable($var->name, $valueToWrite, $nativeValueToWrite, TrinaryLogic::createYes());
} else {
if ($var instanceof PropertyFetch || $var instanceof StaticPropertyFetch) {
$nodeCallback(new PropertyAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scope);
$nodeCallback(new PropertyAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scopeBeforeAssignEval);
if ($var instanceof PropertyFetch && $var->name instanceof Node\Identifier && !$isAssignOp) {
$scope = $scope->assignInitializedProperty($scope->getType($var->var), $var->name->toString());
}
Expand Down Expand Up @@ -5574,9 +5576,9 @@ private function processAssignVar(
}
} else {
if ($var instanceof Variable) {
$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scope);
$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scopeBeforeAssignEval);
} elseif ($var instanceof PropertyFetch || $var instanceof StaticPropertyFetch) {
$nodeCallback(new PropertyAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scope);
$nodeCallback(new PropertyAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scopeBeforeAssignEval);
if ($var instanceof PropertyFetch && $var->name instanceof Node\Identifier && !$isAssignOp) {
$scope = $scope->assignInitializedProperty($scope->getType($var->var), $var->name->toString());
}
Expand Down
10 changes: 10 additions & 0 deletions tests/PHPStan/Rules/Variables/ParameterOutAssignedTypeRuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,14 @@ public function testBenevolentArrayKey(): void
$this->analyse([__DIR__ . '/data/benevolent-array-key.php'], []);
}

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

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

}
40 changes: 40 additions & 0 deletions tests/PHPStan/Rules/Variables/data/bug-13093.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php

declare(strict_types=1);

namespace Bug13093;

use function array_shift;
use function count;
use Generator;
use function PHPStan\debugScope;
use function PHPStan\dumpType;

class MutantProcessContainer {}

final class ParallelProcessRunner
{
/**
* @var array<int, MutantProcessContainer>
*/
private array $nextMutantProcessKillerContainer = [];

/**
* @param MutantProcessContainer[] $bucket
* @param Generator<MutantProcessContainer> $input
*/
public function fillBucketOnce(array &$bucket, Generator $input, int $threadCount): int
{
if (count($bucket) >= $threadCount || !$input->valid()) {
if ($this->nextMutantProcessKillerContainer !== []) {
$bucket[] = array_shift($this->nextMutantProcessKillerContainer);
}

return 0;
}

return 1;
}

}

26 changes: 26 additions & 0 deletions tests/PHPStan/Rules/Variables/data/bug-13093b.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

declare(strict_types=1);

namespace Bug13093b;

use function array_shift;

final class ParallelProcessRunner
{
/**
* @var array<int, string>
*/
private array $nextMutantProcessKillerContainer = [];

public function fillBucketOnce(string &$killer): int
{
if ($this->nextMutantProcessKillerContainer !== []) {
$killer = array_shift($this->nextMutantProcessKillerContainer);
}

return 0;
}

}

Loading