mirror of
https://github.com/danog/psalm.git
synced 2024-11-26 20:34:47 +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 :)
223 lines
8.3 KiB
PHP
223 lines
8.3 KiB
PHP
<?php
|
|
|
|
namespace Psalm\Tests\FileManipulation;
|
|
|
|
class ThrowsBlockAdditionTest extends FileManipulationTestCase
|
|
{
|
|
public function providerValidCodeParse(): array
|
|
{
|
|
return [
|
|
'addThrowsAnnotationToFunction' => [
|
|
'input' => '<?php
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \InvalidArgumentException();
|
|
}
|
|
return $s;
|
|
}',
|
|
'output' => '<?php
|
|
/**
|
|
* @throws InvalidArgumentException
|
|
*/
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \InvalidArgumentException();
|
|
}
|
|
return $s;
|
|
}',
|
|
'php_version' => '7.4',
|
|
'issues_to_fix' => ['MissingThrowsDocblock'],
|
|
'safe_types' => true,
|
|
],
|
|
'addMultipleThrowsAnnotationToFunction' => [
|
|
'input' => '<?php
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \InvalidArgumentException();
|
|
}
|
|
if("" === \trim($s)) {
|
|
throw new \DomainException();
|
|
}
|
|
return $s;
|
|
}',
|
|
'output' => '<?php
|
|
/**
|
|
* @throws InvalidArgumentException|DomainException
|
|
*/
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \InvalidArgumentException();
|
|
}
|
|
if("" === \trim($s)) {
|
|
throw new \DomainException();
|
|
}
|
|
return $s;
|
|
}',
|
|
'php_version' => '7.4',
|
|
'issues_to_fix' => ['MissingThrowsDocblock'],
|
|
'safe_types' => true,
|
|
],
|
|
'preservesExistingThrowsAnnotationToFunction' => [
|
|
'input' => '<?php
|
|
/**
|
|
* @throws InvalidArgumentException|DomainException
|
|
*/
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \Exception();
|
|
}
|
|
return $s;
|
|
}',
|
|
'output' => '<?php
|
|
/**
|
|
* @throws InvalidArgumentException|DomainException
|
|
* @throws Exception
|
|
*/
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \Exception();
|
|
}
|
|
return $s;
|
|
}',
|
|
'php_version' => '7.4',
|
|
'issues_to_fix' => ['MissingThrowsDocblock'],
|
|
'safe_types' => true,
|
|
],
|
|
'doesNotAddDuplicateThrows' => [
|
|
'input' => '<?php
|
|
/**
|
|
* @throws InvalidArgumentException
|
|
*/
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \InvalidArgumentException();
|
|
}
|
|
if("" === \trim($s)) {
|
|
throw new \DomainException();
|
|
}
|
|
return $s;
|
|
}',
|
|
'output' => '<?php
|
|
/**
|
|
* @throws InvalidArgumentException
|
|
* @throws DomainException
|
|
*/
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \InvalidArgumentException();
|
|
}
|
|
if("" === \trim($s)) {
|
|
throw new \DomainException();
|
|
}
|
|
return $s;
|
|
}',
|
|
'php_version' => '7.4',
|
|
'issues_to_fix' => ['MissingThrowsDocblock'],
|
|
'safe_types' => true,
|
|
],
|
|
'addThrowsAnnotationToFunctionInNamespace' => [
|
|
'input' => '<?php
|
|
namespace Foo;
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \InvalidArgumentException();
|
|
}
|
|
return $s;
|
|
}',
|
|
'output' => '<?php
|
|
namespace Foo;
|
|
/**
|
|
* @throws \InvalidArgumentException
|
|
*/
|
|
function foo(string $s): string {
|
|
if("" === $s) {
|
|
throw new \InvalidArgumentException();
|
|
}
|
|
return $s;
|
|
}',
|
|
'php_version' => '7.4',
|
|
'issues_to_fix' => ['MissingThrowsDocblock'],
|
|
'safe_types' => true,
|
|
],
|
|
'addThrowsAnnotationToFunctionFromFunctionFromOtherNamespace' => [
|
|
'input' => '<?php
|
|
namespace Foo {
|
|
function foo(): void {
|
|
\Bar\bar();
|
|
}
|
|
}
|
|
namespace Bar {
|
|
class BarException extends \DomainException {}
|
|
/**
|
|
* @throws BarException
|
|
*/
|
|
function bar(): void {
|
|
throw new BarException();
|
|
}
|
|
}',
|
|
'output' => '<?php
|
|
namespace Foo {
|
|
/**
|
|
* @throws \Bar\BarException
|
|
*/
|
|
function foo(): void {
|
|
\Bar\bar();
|
|
}
|
|
}
|
|
namespace Bar {
|
|
class BarException extends \DomainException {}
|
|
/**
|
|
* @throws BarException
|
|
*/
|
|
function bar(): void {
|
|
throw new BarException();
|
|
}
|
|
}',
|
|
'php_version' => '7.4',
|
|
'issues_to_fix' => ['MissingThrowsDocblock'],
|
|
'safe_types' => true,
|
|
],
|
|
'addThrowsAnnotationAccountsForUseStatements' => [
|
|
'input' => '<?php
|
|
namespace Foo {
|
|
use Bar\BarException;
|
|
function foo(): void {
|
|
bar();
|
|
}
|
|
/**
|
|
* @throws BarException
|
|
*/
|
|
function bar(): void {
|
|
throw new BarException();
|
|
}
|
|
}
|
|
namespace Bar {
|
|
class BarException extends \DomainException {}
|
|
}',
|
|
'output' => '<?php
|
|
namespace Foo {
|
|
use Bar\BarException;
|
|
/**
|
|
* @throws BarException
|
|
*/
|
|
function foo(): void {
|
|
bar();
|
|
}
|
|
/**
|
|
* @throws BarException
|
|
*/
|
|
function bar(): void {
|
|
throw new BarException();
|
|
}
|
|
}
|
|
namespace Bar {
|
|
class BarException extends \DomainException {}
|
|
}',
|
|
'php_version' => '7.4',
|
|
'issues_to_fix' => ['MissingThrowsDocblock'],
|
|
'safe_types' => true,
|
|
],
|
|
];
|
|
}
|
|
}
|