danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

don't disable checks when includes can't be resolved

Browse Source 
Any unresolvable include (even suppressed ones) would lead to some
subsequent tests being disabled as a side-effect.

this fixes #2817
This commit is contained in:
Philip Hofstetter 2020-02-14 11:33:34 +01:00 committed by Matthew Brown
parent 35c1670602
commit f2277ebb6d
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Psalm/Internal/Analyzer/Statements/Expression/IncludeAnalyzer.php
View File

@ -160,9 +160,6 @@ class IncludeAnalyzer
$global_context $global_context
); );
} catch (\Psalm\Exception\UnpreparedAnalysisException $e) { } catch (\Psalm\Exception\UnpreparedAnalysisException $e) {
$context->check_classes = false;
$context->check_variables = false;
$context->check_functions = false;
} }
foreach ($include_file_analyzer->getRequiredFilePaths() as $required_file_path) { foreach ($include_file_analyzer->getRequiredFilePaths() as $required_file_path) {
@ -203,10 +200,6 @@ class IncludeAnalyzer
} }
} }
$context->check_classes = false;
$context->check_variables = false;
$context->check_functions = false;
return null; return null;
} }

19
tests/IncludeTest.php
View File

@ -779,6 +779,25 @@ class IncludeTest extends TestCase
], ],
'error_message' => 'UndefinedConstant', 'error_message' => 'UndefinedConstant',
], ],
'undefinedMethodAfterInvalidRequire' => [
'files' => [
getcwd() . DIRECTORY_SEPARATOR . 'file2.php' => '<?php
/** @psalm-suppress MissingFile */
require("doesnotexist.php");
require("file1.php");
foo();
bar();
',
getcwd() . DIRECTORY_SEPARATOR . 'file1.php' => '<?php
function bar(): void {}
',
],
'files_to_check' => [
getcwd() . DIRECTORY_SEPARATOR . 'file2.php',
],
'error_message' => 'UndefinedFunction',
],
]; ];
} }
} }