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

Improved class name generation for @throws annotation

Browse Source
This commit is contained in:
dennis 2022-09-17 10:55:19 +02:00
parent 8ffc747349
commit ab690df4da
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
View File

@ -720,7 +720,14 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
}
if (!$is_expected) {
$missingThrowsDocblockErrors[] = $possibly_thrown_exception;
$missing_docblock_exception = new TNamedObject($possibly_thrown_exception);
$missingThrowsDocblockErrors[] = $missing_docblock_exception->toNamespacedString(
$this->source->getNamespace(),
$this->source->getAliasedClassesFlipped(),
$this->source->getFQCLN(),
true
);
foreach ($codelocations as $codelocation) {
// issues are suppressed in ThrowAnalyzer, CallAnalyzer, etc.
IssueBuffer::maybeAdd(

1
src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php
View File

@ -405,7 +405,6 @@ class FunctionDocblockManipulator
$inferredThrowsClause = array_reduce(
$this->throwsExceptions,
function (string $throwsClause, string $exception) {
$exception = '\\' . $exception;
return $throwsClause === '' ? $exception : $throwsClause.'|'.$exception;
},
''

8
tests/FileManipulation/ThrowsBlockAdditionTest.php
View File

@ -20,7 +20,7 @@ class ThrowsBlockAdditionTest extends FileManipulationTestCase
}',
'<?php
/**
* @throws \InvalidArgumentException
* @throws InvalidArgumentException
*/
function foo(string $s): string {
if("" === $s) {
@ -45,7 +45,7 @@ class ThrowsBlockAdditionTest extends FileManipulationTestCase
}',
'<?php
/**
* @throws \InvalidArgumentException|\DomainException
* @throws InvalidArgumentException|DomainException
*/
function foo(string $s): string {
if("" === $s) {
@ -74,7 +74,7 @@ class ThrowsBlockAdditionTest extends FileManipulationTestCase
'<?php
/**
* @throws InvalidArgumentException|DomainException
* @throws \Exception
* @throws Exception
*/
function foo(string $s): string {
if("" === $s) {
@ -103,7 +103,7 @@ class ThrowsBlockAdditionTest extends FileManipulationTestCase
'<?php
/**
* @throws InvalidArgumentException
* @throws \DomainException
* @throws DomainException
*/
function foo(string $s): string {
if("" === $s) {