mirror of
https://github.com/danog/psalm.git
synced 2024-11-30 04:39:00 +01:00
Daniil Gentili
1986c8b4a8
* Immutable CodeLocation * Remove excess clones * Remove external clones * Remove leftover clones * Fix final clone issue * Immutable storages * Refactoring * Fixes * Fixes * Fix * Fix * Fixes * Simplify * Fixes * Fix * Fixes * Update * Fix * Cache global types * Fix * Update * Update * Fixes * Fixes * Refactor * Fixes * Fix * Fix * More caching * Fix * Fix * Update * Update * Fix * Fixes * Update * Refactor * Update * Fixes * Break one more test * Fix * FIx * Fix * Fix * Fix * Fix * Improve performance and readability * Equivalent logic * Fixes * Revert * Revert "Revert" This reverts commit f9175100c8452c80559234200663fd4c4f4dd889. * Fix * Fix reference bug * Make default TypeVisitor immutable * Bugfix * Remove clones * Partial refactoring * Refactoring * Fixes * Fix * Fixes * Fixes * cs-fix * Fix final bugs * Add test * Misc fixes * Update * Fixes * Experiment with removing different property * revert "Experiment with removing different property" This reverts commit ac1156e077fc4ea633530d51096d27b6e88bfdf9. * Uniform naming * Uniform naming * Hack hotfix * Clean up $_FILES ref #8621 * Undo hack, try fixing properly * Helper method * Remove redundant call * Partially fix bugs * Cleanup * Change defaults * Fix bug * Fix (?, hope this doesn't break anything else) * cs-fix * Review fixes * Bugfix * Bugfix * Improve logic * Add support for list{} and callable-list{} types, properly implement array_is_list assertions (fixes #8389) * Default to sealed arrays * Fix array_merge bug * Fixes * Fix * Sealed type checks * Properly infer properties-of and get_object_vars on final classes * Fix array_map zipping * Fix tests * Fixes * Fixes * Fix more stuff * Recursively resolve type aliases * Fix typo * Fixes * Fix array_is_list assertion on keyed array * Add BC docs * Fixes * fix * Update * Update * Update * Update * Seal arrays with count assertions * Fix #8528 * Fix * Update * Improve sealed array foreach logic * get_object_vars on template properties * Fix sealed array assertion reconciler logic * Improved reconciler * Add tests * Single source of truth for test types * Fix tests * Fixup tests * Fixup tests * Fixup tests * Update * Fix tests * Fix tests * Final fixes * Fixes * Use list syntax only when needed * Fix tests * Cs-fix * Update docs * Update docs * Update docs * Update docs * Update docs * Document missing types * Update docs * Improve class-string-map docs * Update * Update * I love working on psalm :) * Keep arrays unsealed by default * Fixup tests * Fix syntax mistake * cs-fix * Fix typo * Re-import missing types * Keep strict types only in return types * argc/argv fixes * argc/argv fixes * Fix test * Comment-out valinor code, pinging @romm pls merge https://github.com/CuyZ/Valinor/pull/246 so we can add valinor to the psalm docs :)
672 lines
22 KiB
PHP
672 lines
22 KiB
PHP
<?php
|
|
|
|
namespace Psalm\Tests\FileManipulation;
|
|
|
|
class UnusedCodeManipulationTest extends FileManipulationTestCase
|
|
{
|
|
public function providerValidCodeParse(): array
|
|
{
|
|
return [
|
|
'removePossiblyUnusedMethod' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
public function bar() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'removePossiblyUnusedMethodInMiddle' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
public function bar() : void {}
|
|
|
|
public function bat() : void {}
|
|
}
|
|
|
|
(new A)->foo();
|
|
(new A)->bat();',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
public function bat() : void {}
|
|
}
|
|
|
|
(new A)->foo();
|
|
(new A)->bat();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'removeAllPossiblyUnusedMethods' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
public function bar() : void {}
|
|
|
|
public function bat() : void {}
|
|
}
|
|
|
|
new A();',
|
|
'output' => '<?php
|
|
class A {
|
|
|
|
}
|
|
|
|
new A();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedMethodWithMixedUse' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo($a) {
|
|
$a->foo();
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo($a) {
|
|
$a->foo();
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedMethodWithSuppression' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
/** @psalm-suppress PossiblyUnusedMethod */
|
|
public function bar() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
/** @psalm-suppress PossiblyUnusedMethod */
|
|
public function bar() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'removeUnusedMethod' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
private function bar() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['UnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'removeUnusedMethodAtBeginning' => [
|
|
'input' => '<?php
|
|
class A {
|
|
private function foo() : void {}
|
|
|
|
public function bar() : void {}
|
|
}
|
|
|
|
(new A)->bar();',
|
|
'output' => '<?php
|
|
class A {
|
|
|
|
|
|
public function bar() : void {}
|
|
}
|
|
|
|
(new A)->bar();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['UnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'removePossiblyUnusedMethodWithDocblock' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
/** @return void */
|
|
public function bar() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'removeUnusedMethodWithDocblock' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
/** @return void */
|
|
private function bar() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
(new A)->foo();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['UnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedMethodWithVariableCall' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
echo $a->$var();
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
echo $a->$var();
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedMethodWithVariableCallableCall' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function takeCallable(callable $c) : void {}
|
|
|
|
function foo(A $a, string $var) {
|
|
takeCallable([$a, $var]);
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function takeCallable(callable $c) : void {}
|
|
|
|
function foo(A $a, string $var) {
|
|
takeCallable([$a, $var]);
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedMethodWithCallUserFuncCall' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
call_user_func([$a, $var]);
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
call_user_func([$a, $var]);
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedMethodWithVariableCallableLhsCall' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
public function bar() : void {}
|
|
}
|
|
|
|
function takeCallable(callable $c) : void {}
|
|
|
|
function foo($a) {
|
|
takeCallable([$a, "foo"]);
|
|
}
|
|
|
|
foo(new A);',
|
|
'output' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
|
|
}
|
|
|
|
function takeCallable(callable $c) : void {}
|
|
|
|
function foo($a) {
|
|
takeCallable([$a, "foo"]);
|
|
}
|
|
|
|
foo(new A);',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedMethodWithVariableCallOnParent' => [
|
|
'input' => '<?php
|
|
class A { }
|
|
|
|
class B extends A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
echo $a->$var();
|
|
}
|
|
|
|
foo(new B);',
|
|
'output' => '<?php
|
|
class A { }
|
|
|
|
class B extends A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
echo $a->$var();
|
|
}
|
|
|
|
foo(new B);',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'removePossiblyUnusedMethodWithVariableCall' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() : void {}
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
/** @psalm-ignore-variable-method */
|
|
echo $a->$var();
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
/** @psalm-ignore-variable-method */
|
|
echo $a->$var();
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod'],
|
|
'safe_types' => true,
|
|
],
|
|
'removePossiblyUnusedMethodAndMissingReturnType' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function foo() {}
|
|
}
|
|
|
|
new A();',
|
|
'output' => '<?php
|
|
class A {
|
|
|
|
}
|
|
|
|
new A();',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedMethod', 'MissingReturnType'],
|
|
'safe_types' => true,
|
|
],
|
|
'removePossiblyUnusedPropertyWithDocblock' => [
|
|
'input' => '<?php
|
|
class A {
|
|
/** @var string */
|
|
public $foo = "hello";
|
|
|
|
/** @var string */
|
|
public $bar = "hello";
|
|
}
|
|
|
|
echo (new A)->foo;',
|
|
'output' => '<?php
|
|
class A {
|
|
/** @var string */
|
|
public $foo = "hello";
|
|
}
|
|
|
|
echo (new A)->foo;',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithMixedUse' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo($a) {
|
|
echo $a->foo;
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo($a) {
|
|
echo $a->foo;
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithSuppression' => [
|
|
'input' => '<?php
|
|
/** @psalm-suppress PossiblyUnusedProperty */
|
|
class A {
|
|
public $foo = "hello";
|
|
}',
|
|
'output' => '<?php
|
|
/** @psalm-suppress PossiblyUnusedProperty */
|
|
class A {
|
|
public $foo = "hello";
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithVariableFetch' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
echo $a->$var;
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
echo $a->$var;
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'removePossiblyUnusedPropertyWithVariableFetch' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
/** @psalm-ignore-variable-property */
|
|
echo $a->$var;
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
/** @psalm-ignore-variable-property */
|
|
echo $a->$var;
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithVariableFetchInParent' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public function __set(string $k, $v) {
|
|
$this->$k = $v;
|
|
}
|
|
}
|
|
|
|
class B extends A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
(new B())->__set("foo", "bar");',
|
|
'output' => '<?php
|
|
class A {
|
|
public function __set(string $k, $v) {
|
|
$this->$k = $v;
|
|
}
|
|
}
|
|
|
|
class B extends A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
(new B())->__set("foo", "bar");',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithVariableOnParent' => [
|
|
'input' => '<?php
|
|
class A {}
|
|
|
|
class B extends A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
echo $a->$var;
|
|
}
|
|
|
|
foo(new A(), "foo");',
|
|
'output' => '<?php
|
|
class A {}
|
|
|
|
class B extends A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
echo $a->$var;
|
|
}
|
|
|
|
foo(new A(), "foo");',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithVariableFetchImplementedInterface' => [
|
|
'input' => '<?php
|
|
interface I {}
|
|
|
|
class A implements I {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(I $i, string $var) {
|
|
echo $i->$var;
|
|
}
|
|
|
|
foo(new A(), "foo");',
|
|
'output' => '<?php
|
|
interface I {}
|
|
|
|
class A implements I {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(I $i, string $var) {
|
|
echo $i->$var;
|
|
}
|
|
|
|
foo(new A(), "foo");',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithStaticVariableFetch' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public static $foo = "hello";
|
|
}
|
|
|
|
function foo(string $var) {
|
|
echo A::$$var;
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public static $foo = "hello";
|
|
}
|
|
|
|
function foo(string $var) {
|
|
echo A::$$var;
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithVariableAssignment' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
$a->$var = "hello";
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
$a->$var = "hello";
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithVariableAssignmentOnParent' => [
|
|
'input' => '<?php
|
|
class A {}
|
|
|
|
class B extends A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
$a->$var = "hello";
|
|
}
|
|
|
|
foo(new B);',
|
|
'output' => '<?php
|
|
class A {}
|
|
|
|
class B extends A {
|
|
public $foo = "hello";
|
|
}
|
|
|
|
function foo(A $a, string $var) {
|
|
$a->$var = "hello";
|
|
}
|
|
|
|
foo(new B);',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'dontRemovePossiblyUnusedPropertyWithStaticVariableAssignment' => [
|
|
'input' => '<?php
|
|
class A {
|
|
public static $foo = "hello";
|
|
}
|
|
|
|
function foo(string $var) {
|
|
A::$$var = "hello";
|
|
}',
|
|
'output' => '<?php
|
|
class A {
|
|
public static $foo = "hello";
|
|
}
|
|
|
|
function foo(string $var) {
|
|
A::$$var = "hello";
|
|
}',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['PossiblyUnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
'removeUnusedPropertyWithDocblock' => [
|
|
'input' => '<?php
|
|
class A {
|
|
/** @var string */
|
|
public $foo = "hello";
|
|
|
|
/** @var string */
|
|
private $bar = "hello";
|
|
}
|
|
|
|
echo (new A)->foo;',
|
|
'output' => '<?php
|
|
class A {
|
|
/** @var string */
|
|
public $foo = "hello";
|
|
}
|
|
|
|
echo (new A)->foo;',
|
|
'php_version' => '7.1',
|
|
'issues_to_fix' => ['UnusedProperty'],
|
|
'safe_types' => true,
|
|
],
|
|
];
|
|
}
|
|
}
|