Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #6066 - introduce more robust system for capturing template constraints #6072

Merged
merged 2 commits into from
Jul 11, 2021
Merged

Fix #6066 - introduce more robust system for capturing template constraints #6072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f96b15
Fix #6066 - add better system for capturing template constraints
muglug Jul 10, 2021
3680d8d
Fix comment
muglug Jul 10, 2021
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
5 changes: 4 additions & 1 deletion src/Psalm/Internal/Analyzer/ClassAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,10 @@ public static function addContextProperties(
$pt_name = array_keys($parent_storage->template_types)[$pt_offset];
if (isset($template_standins->lower_bounds[$pt_name][$parent_class])) {
$lower_bounds[$pt_name][$parent_class] =
$template_standins->lower_bounds[$pt_name][$parent_class]->type;
TemplateStandinTypeReplacer::getMostSpecificTypeFromBounds(
$template_standins->lower_bounds[$pt_name][$parent_class],
$codebase
);
}
}
}
Expand Down
14 changes: 8 additions & 6 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,17 +367,19 @@ private static function checkFunctionLikeTypeMatches(
[$template_type->param_name]
[$template_type->defining_class]
)) {
$template_result->lower_bounds[$template_type->param_name][$template_type->defining_class]
= new TemplateBound(
$template_result->lower_bounds[$template_type->param_name][$template_type->defining_class] = [
new TemplateBound(
clone $template_result->upper_bounds
[$template_type->param_name]
[$template_type->defining_class]->type
);
)
];
} else {
$template_result->lower_bounds[$template_type->param_name][$template_type->defining_class]
= new TemplateBound(
$template_result->lower_bounds[$template_type->param_name][$template_type->defining_class] = [
new TemplateBound(
clone $template_type->as
);
)
];
}
}
}
Expand Down
16 changes: 11 additions & 5 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
use function count;
use function in_array;
use function is_string;
use function reset;
use function strpos;
use function strtolower;

Expand Down Expand Up @@ -327,10 +328,13 @@ private static function handleClosureArg(

$replace_template_result = new \Psalm\Internal\Type\TemplateResult(
array_map(
function ($template_map) {
function ($template_map) use ($codebase) {
return array_map(
function ($bound) {
return $bound->type;
function ($lower_bounds) use ($codebase) {
return \Psalm\Internal\Type\TemplateStandinTypeReplacer::getMostSpecificTypeFromBounds(
$lower_bounds,
$codebase
);
},
$template_map
);
Expand Down Expand Up @@ -563,8 +567,10 @@ public static function checkArgumentsMatch(

if ($class_template_result) {
foreach ($class_template_result->lower_bounds as $template_name => $type_map) {
foreach ($type_map as $class => $bound) {
$class_generic_params[$template_name][$class] = clone $bound->type;
foreach ($type_map as $class => $lower_bounds) {
if (count($lower_bounds) === 1) {
$class_generic_params[$template_name][$class] = clone reset($lower_bounds)->type;
}
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ public static function analyze(
$statements_analyzer->node_data->setIfTrueAssertions(
$stmt,
array_map(
function (Assertion $assertion) use ($inferred_lower_bounds) : Assertion {
return $assertion->getUntemplatedCopy($inferred_lower_bounds ?: [], null);
function (Assertion $assertion) use ($inferred_lower_bounds, $codebase) : Assertion {
return $assertion->getUntemplatedCopy($inferred_lower_bounds ?: [], null, $codebase);
},
$function_call_info->function_storage->if_true_assertions
)
Expand All @@ -295,8 +295,8 @@ function (Assertion $assertion) use ($inferred_lower_bounds) : Assertion {
$statements_analyzer->node_data->setIfFalseAssertions(
$stmt,
array_map(
function (Assertion $assertion) use ($inferred_lower_bounds) : Assertion {
return $assertion->getUntemplatedCopy($inferred_lower_bounds ?: [], null);
function (Assertion $assertion) use ($inferred_lower_bounds, $codebase) : Assertion {
return $assertion->getUntemplatedCopy($inferred_lower_bounds ?: [], null, $codebase);
},
$function_call_info->function_storage->if_false_assertions
)
Expand Down
24 changes: 15 additions & 9 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallReturnTypeFetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,27 @@ public static function fetch(
if (!isset($template_result->lower_bounds[$template_name])) {
if ($template_name === 'TFunctionArgCount') {
$template_result->lower_bounds[$template_name] = [
'fn-' . $function_id => new TemplateBound(
Type::getInt(false, count($stmt->args))
)
'fn-' . $function_id => [
new TemplateBound(
Type::getInt(false, count($stmt->args))
)
]
];
} elseif ($template_name === 'TPhpMajorVersion') {
$template_result->lower_bounds[$template_name] = [
'fn-' . $function_id => new TemplateBound(
Type::getInt(false, $codebase->php_major_version)
)
'fn-' . $function_id => [
new TemplateBound(
Type::getInt(false, $codebase->php_major_version)
)
]
];
} else {
$template_result->lower_bounds[$template_name] = [
'fn-' . $function_id => new TemplateBound(
Type::getEmpty()
)
'fn-' . $function_id => [
new TemplateBound(
Type::getEmpty()
)
]
];
}
}
Expand Down
12 changes: 8 additions & 4 deletions .../Internal/Analyzer/Statements/Expression/Call/Method/ExistingAtomicMethodCallAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,13 @@ public static function analyze(
array_map(
function (Assertion $assertion) use (
$class_template_params,
$lhs_var_id
$lhs_var_id,
$codebase
) : Assertion {
return $assertion->getUntemplatedCopy(
$class_template_params ?: [],
$lhs_var_id
$lhs_var_id,
$codebase
);
},
$method_storage->if_true_assertions
Expand All @@ -340,11 +342,13 @@ function (Assertion $assertion) use (
array_map(
function (Assertion $assertion) use (
$class_template_params,
$lhs_var_id
$lhs_var_id,
$codebase
) : Assertion {
return $assertion->getUntemplatedCopy(
$class_template_params ?: [],
$lhs_var_id
$lhs_var_id,
$codebase
);
},
$method_storage->if_false_assertions
Expand Down
20 changes: 13 additions & 7 deletions ...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,19 +534,25 @@ private static function replaceTemplateTypes(
) {
if ($template_type->param_name === 'TFunctionArgCount') {
$template_result->lower_bounds[$template_type->param_name] = [
'fn-' . strtolower((string) $method_id) => new TemplateBound(
Type::getInt(false, $arg_count)
)
'fn-' . strtolower((string) $method_id) => [
new TemplateBound(
Type::getInt(false, $arg_count)
)
]
];
} elseif ($template_type->param_name === 'TPhpMajorVersion') {
$template_result->lower_bounds[$template_type->param_name] = [
'fn-' . strtolower((string) $method_id) => new TemplateBound(
Type::getInt(false, $codebase->php_major_version)
)
'fn-' . strtolower((string) $method_id) => [
new TemplateBound(
Type::getInt(false, $codebase->php_major_version)
)
]
];
} else {
$template_result->lower_bounds[$template_type->param_name] = [
($template_type->defining_class) => new TemplateBound(Type::getEmpty())
($template_type->defining_class) => [
new TemplateBound(Type::getEmpty())
]
];
}
}
Expand Down
24 changes: 15 additions & 9 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\Internal\Codebase\TaintFlowGraph;
use Psalm\Internal\DataFlow\DataFlowNode;
use Psalm\Internal\Type\TemplateStandinTypeReplacer;
use Psalm\Issue\AbstractInstantiation;
use Psalm\Issue\DeprecatedClass;
use Psalm\Issue\ImpureMethodCall;
Expand Down Expand Up @@ -439,8 +440,8 @@ private static function analyzeNamedConstructor(
$statements_analyzer->node_data->setIfTrueAssertions(
$stmt,
\array_map(
function ($assertion) use ($generic_params) {
return $assertion->getUntemplatedCopy($generic_params, null);
function ($assertion) use ($generic_params, $codebase) {
return $assertion->getUntemplatedCopy($generic_params, null, $codebase);
},
$method_storage->if_true_assertions
)
Expand All @@ -451,8 +452,8 @@ function ($assertion) use ($generic_params) {
$statements_analyzer->node_data->setIfFalseAssertions(
$stmt,
\array_map(
function ($assertion) use ($generic_params) {
return $assertion->getUntemplatedCopy($generic_params, null);
function ($assertion) use ($generic_params, $codebase) {
return $assertion->getUntemplatedCopy($generic_params, null, $codebase);
},
$method_storage->if_false_assertions
)
Expand All @@ -465,18 +466,23 @@ function ($assertion) use ($generic_params) {
if ($storage->template_types) {
foreach ($storage->template_types as $template_name => $base_type) {
if (isset($template_result->lower_bounds[$template_name][$fq_class_name])) {
$generic_param_type
= $template_result->lower_bounds[$template_name][$fq_class_name]->type;
$generic_param_type = TemplateStandinTypeReplacer::getMostSpecificTypeFromBounds(
$template_result->lower_bounds[$template_name][$fq_class_name],
$codebase
);
} elseif ($storage->template_extended_params && $template_result->lower_bounds) {
$generic_param_type = self::getGenericParamForOffset(
$fq_class_name,
$template_name,
$storage->template_extended_params,
array_map(
function ($type_map) {
function ($type_map) use ($codebase) {
return array_map(
function ($bound) {
return $bound->type;
function ($bounds) use ($codebase) {
return TemplateStandinTypeReplacer::getMostSpecificTypeFromBounds(
$bounds,
$codebase
);
},
$type_map
);
Expand Down
28 changes: 17 additions & 11 deletions ...nal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ public static function analyze(
$statements_analyzer->node_data->setIfTrueAssertions(
$stmt,
array_map(
function (Assertion $assertion) use ($generic_params) : Assertion {
return $assertion->getUntemplatedCopy($generic_params, null);
function (Assertion $assertion) use ($generic_params, $codebase) : Assertion {
return $assertion->getUntemplatedCopy($generic_params, null, $codebase);
},
$method_storage->if_true_assertions
)
Expand All @@ -330,8 +330,8 @@ function (Assertion $assertion) use ($generic_params) : Assertion {
$statements_analyzer->node_data->setIfFalseAssertions(
$stmt,
array_map(
function (Assertion $assertion) use ($generic_params) : Assertion {
return $assertion->getUntemplatedCopy($generic_params, null);
function (Assertion $assertion) use ($generic_params, $codebase) : Assertion {
return $assertion->getUntemplatedCopy($generic_params, null, $codebase);
},
$method_storage->if_false_assertions
)
Expand Down Expand Up @@ -488,19 +488,25 @@ private static function getMethodReturnType(
)) {
if ($template_type->param_name === 'TFunctionArgCount') {
$template_result->lower_bounds[$template_type->param_name] = [
'fn-' . strtolower((string)$method_id) => new TemplateBound(
Type::getInt(false, count($stmt->args))
)
'fn-' . strtolower((string)$method_id) => [
new TemplateBound(
Type::getInt(false, count($stmt->args))
)
]
];
} elseif ($template_type->param_name === 'TPhpMajorVersion') {
$template_result->lower_bounds[$template_type->param_name] = [
'fn-' . strtolower((string)$method_id) => new TemplateBound(
Type::getInt(false, $codebase->php_major_version)
)
'fn-' . strtolower((string)$method_id) => [
new TemplateBound(
Type::getInt(false, $codebase->php_major_version)
)
]
];
} else {
$template_result->lower_bounds[$template_type->param_name] = [
($template_type->defining_class) => new TemplateBound(Type::getEmpty())
($template_type->defining_class) => [
new TemplateBound(Type::getEmpty())
]
];
}
}
Expand Down
Loading