mirror of
https://github.com/danog/psalm.git
synced 2024-11-30 04:39:00 +01:00
dabfb16e34
* Run tests in random order Being able to run tests in any order is a pre-requisite for being able to run them in parallel. * Reset type coverage between tests, fix affected tests * Reset parser and lexer between test runs and on php version change Previously lexer was reset, but parser kept the reference to the old one, and reference to the parser was kept by StatementsProvider. This resulted in order-dependent tests - if the parser was first initialized with phpVersion set to 7.4 then arrow functions worked fine, but were failing when the parser was initially constructed with settings for 7.3 This can be demonstrated on current master by upgrading to nikic/php-parser:4.9 and running: ``` vendor/bin/phpunit --no-coverage --filter="inferredArgArrowFunction" tests/ClosureTest.php ``` Now all tests using PHP 7.4 features must set the PHP version accordingly. * Marked more tests using 7.4 syntax * Reset newline-between-annotation flag between tests * Resolve real paths before passing them to checkPaths When checkPaths is called from psalm.php the paths are resolved, so we just mimicking SUT behaviour here. * Restore newline-between-annotations in DocCommentTest * Tweak Appveyor caches * Tweak TravisCI caches * Tweak CircleCI caches * Run tests in parallel Use `vendor/bin/paratest` instead of `vendor/bin/phpunit` * Use default paratest runner on Windows WrapperRunner is not supported on Windows. * TRAVIS_TAG could be empty * Restore appveyor conditional caching
383 lines
14 KiB
PHP
383 lines
14 KiB
PHP
<?php
|
|
namespace Psalm\Tests\FileUpdates;
|
|
|
|
use function array_keys;
|
|
use function count;
|
|
use const DIRECTORY_SEPARATOR;
|
|
use function getcwd;
|
|
use Psalm\Internal\Analyzer\FileAnalyzer;
|
|
use Psalm\Internal\Analyzer\ProjectAnalyzer;
|
|
use Psalm\Internal\Provider\Providers;
|
|
use Psalm\Tests\Internal\Provider;
|
|
use Psalm\Tests\TestConfig;
|
|
|
|
class ErrorFixTest extends \Psalm\Tests\TestCase
|
|
{
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function setUp() : void
|
|
{
|
|
parent::setUp();
|
|
|
|
$this->file_provider = new \Psalm\Tests\Internal\Provider\FakeFileProvider();
|
|
|
|
$config = new TestConfig();
|
|
$config->throw_exception = false;
|
|
|
|
$providers = new Providers(
|
|
$this->file_provider,
|
|
new \Psalm\Tests\Internal\Provider\ParserInstanceCacheProvider(),
|
|
null,
|
|
null,
|
|
new Provider\FakeFileReferenceCacheProvider(),
|
|
new \Psalm\Tests\Internal\Provider\ProjectCacheProvider()
|
|
);
|
|
|
|
$this->project_analyzer = new ProjectAnalyzer(
|
|
$config,
|
|
$providers
|
|
);
|
|
$this->project_analyzer->setPhpVersion('7.3');
|
|
}
|
|
|
|
/**
|
|
* @dataProvider providerTestErrorFix
|
|
*
|
|
* @param array<int, array<string, string>> $files
|
|
* @param array<int, int> $error_counts
|
|
* @param array<string, string> $error_levels
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testErrorFix(
|
|
array $files,
|
|
array $error_counts,
|
|
array $error_levels = []
|
|
) {
|
|
$this->project_analyzer->getCodebase()->diff_methods = true;
|
|
|
|
$codebase = $this->project_analyzer->getCodebase();
|
|
|
|
$config = $codebase->config;
|
|
|
|
foreach ($error_levels as $error_type => $error_level) {
|
|
$config->setCustomErrorLevel($error_type, $error_level);
|
|
}
|
|
|
|
for ($i = 0; $i < count($files); ++$i) {
|
|
$batch = $files[$i];
|
|
|
|
foreach ($batch as $file_path => $contents) {
|
|
$this->file_provider->registerFile($file_path, $contents);
|
|
|
|
if ($i === 0) {
|
|
$codebase->addFilesToAnalyze([$file_path => $file_path]);
|
|
}
|
|
}
|
|
|
|
if ($i === 0) {
|
|
$codebase->scanFiles();
|
|
} else {
|
|
$codebase->reloadFiles($this->project_analyzer, array_keys($batch));
|
|
}
|
|
|
|
$codebase->analyzer->analyzeFiles($this->project_analyzer, 1, false);
|
|
|
|
$expected_count = 0;
|
|
|
|
$data = \Psalm\IssueBuffer::clear();
|
|
|
|
foreach ($data as $file_issues) {
|
|
$expected_count += count($file_issues);
|
|
}
|
|
|
|
$this->assertSame($error_counts[$i], $expected_count);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @return array<string,array{files: array<int, array<string,string>>,error_counts:array<int,int>,error_levels?:array<string,string>}>
|
|
*/
|
|
public function providerTestErrorFix()
|
|
{
|
|
return [
|
|
'fixMissingColonSyntaxError' => [
|
|
'files' => [
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
public function foo() : void {
|
|
$a = 5;
|
|
echo $a;
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
public function foo() : void {
|
|
$a = 5
|
|
echo $a;
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
public function foo() : void {
|
|
$a = 5;
|
|
echo $a;
|
|
}
|
|
}',
|
|
],
|
|
],
|
|
'error_counts' => [0, 1, 0],
|
|
],
|
|
'addReturnTypesToSingleMethod' => [
|
|
'files' => [
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
public function foo() {
|
|
return 5;
|
|
}
|
|
|
|
public function bar() {
|
|
return $this->foo();
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
public function foo() : int {
|
|
return 5;
|
|
}
|
|
|
|
public function bar() {
|
|
return $this->foo();
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
public function foo() : int {
|
|
return 5;
|
|
}
|
|
|
|
public function bar() : int {
|
|
return $this->foo();
|
|
}
|
|
}',
|
|
],
|
|
],
|
|
'error_counts' => [2, 1, 0],
|
|
[
|
|
'MissingReturnType' => \Psalm\Config::REPORT_INFO,
|
|
],
|
|
],
|
|
'traitMethodRenameFirstCorrect' => [
|
|
'files' => [
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
use T;
|
|
public function foo() : void {
|
|
echo $this->bar();
|
|
}
|
|
}',
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'T.php' => '<?php
|
|
namespace Foo;
|
|
|
|
trait T {
|
|
public function bar() : string {
|
|
return "hello";
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
use T;
|
|
public function foo() : void {
|
|
echo $this->bar();
|
|
}
|
|
}',
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'T.php' => '<?php
|
|
namespace Foo;
|
|
|
|
trait T {
|
|
public function bat() : string {
|
|
return "hello";
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
use T;
|
|
public function foo() : void {
|
|
echo $this->bar();
|
|
}
|
|
}',
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'T.php' => '<?php
|
|
namespace Foo;
|
|
|
|
trait T {
|
|
public function bar() : string {
|
|
return "hello";
|
|
}
|
|
}',
|
|
],
|
|
],
|
|
'error_counts' => [0, 1, 0],
|
|
],
|
|
'traitMethodRenameFirstError' => [
|
|
'files' => [
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
use T;
|
|
public function foo() : void {
|
|
echo $this->bar();
|
|
}
|
|
}',
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'T.php' => '<?php
|
|
namespace Foo;
|
|
|
|
trait T {
|
|
public function bat() : string {
|
|
return "hello";
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
use T;
|
|
public function foo() : void {
|
|
echo $this->bar();
|
|
}
|
|
}',
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'T.php' => '<?php
|
|
namespace Foo;
|
|
|
|
trait T {
|
|
public function bar() : string {
|
|
return "hello";
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
namespace Foo;
|
|
|
|
class A {
|
|
use T;
|
|
public function foo() : void {
|
|
echo $this->bar();
|
|
}
|
|
}',
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'T.php' => '<?php
|
|
namespace Foo;
|
|
|
|
trait T {
|
|
public function bar() : string {
|
|
return "hello";
|
|
}
|
|
}',
|
|
],
|
|
],
|
|
'error_counts' => [1, 0, 0],
|
|
],
|
|
'addSuppressions' => [
|
|
'files' => [
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
class C {
|
|
public function foo(array $a) : void {
|
|
foreach ($a as $b) {
|
|
$b->bar();
|
|
}
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
class C {
|
|
public function foo(array $a) : void {
|
|
/**
|
|
* @psalm-suppress MixedAssignment
|
|
*/
|
|
foreach ($a as $b) {
|
|
$b->bar();
|
|
}
|
|
}
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
class C {
|
|
public function foo(array $a) : void {
|
|
/**
|
|
* @psalm-suppress MixedAssignment
|
|
*/
|
|
foreach ($a as $b) {
|
|
/**
|
|
* @psalm-suppress MixedMethodCall
|
|
*/
|
|
$b->bar();
|
|
}
|
|
}
|
|
}',
|
|
],
|
|
],
|
|
'error_counts' => [2, 1, 0],
|
|
],
|
|
'fixDefault' => [
|
|
'files' => [
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
class C {
|
|
/** @var string */
|
|
public $foo = 5;
|
|
}',
|
|
],
|
|
[
|
|
getcwd() . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'A.php' => '<?php
|
|
class C {
|
|
/** @var string */
|
|
public $foo = "hello";
|
|
}',
|
|
],
|
|
],
|
|
'error_counts' => [1, 0],
|
|
],
|
|
];
|
|
}
|
|
}
|