danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix #797 - check backup included file for defined function

Browse Source
This commit is contained in:
Matthew Brown 2018-06-06 21:47:26 -04:00
parent 7c2ec06de8
commit fb3bc2661e
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Psalm/Codebase/Functions.php
View File

@ -53,6 +53,7 @@ class Functions
}
$file_path = $statements_checker->getRootFilePath();
$checked_file_path = $statements_checker->getFilePath();
$file_storage = $this->file_storage_provider->get($file_path);
$function_checkers = $statements_checker->getFunctionCheckers();
@ -71,6 +72,14 @@ class Functions
}
if (!isset($file_storage->declaring_function_ids[$function_id])) {
if ($checked_file_path !== $file_path) {
$file_storage = $this->file_storage_provider->get($checked_file_path);
if (isset($file_storage->functions[$function_id])) {
return $file_storage->functions[$function_id];
}
}
throw new \UnexpectedValueException(
'Expecting ' . $function_id . ' to have storage in ' . $file_path
);

11
tests/IncludeTest.php
View File

@ -386,6 +386,17 @@ class IncludeTest extends TestCase
getcwd() . DIRECTORY_SEPARATOR . 'file1.php',
],
],
'closureInIncludedFile' => [
'files' => [
getcwd() . DIRECTORY_SEPARATOR . 'file1.php' => '<?php
require_once("file2.php");',
getcwd() . DIRECTORY_SEPARATOR . 'file2.php' => '<?php
return function(): string { return "asd"; };',
],
'files_to_check' => [
getcwd() . DIRECTORY_SEPARATOR . 'file1.php',
],
],
'hoistConstants' => [
'files' => [
getcwd() . DIRECTORY_SEPARATOR . 'file1.php' => '<?php