Improved class name generation for @throws annotation

vimeo · Sep 19, 2022 · ab690df · ab690df
1 parent 8ffc747
commit ab690df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
@@ -720,7 +720,14 @@ public function analyze(
             }
 
             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(

diff --git a/src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php b/src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php
@@ -405,7 +405,6 @@ private function getDocblock(): string
             $inferredThrowsClause = array_reduce(
                 $this->throwsExceptions,
                 function (string $throwsClause, string $exception) {
-                    $exception = '\\' . $exception;
                     return $throwsClause === '' ? $exception : $throwsClause.'|'.$exception;
                 },
                 ''

diff --git a/tests/FileManipulation/ThrowsBlockAdditionTest.php b/tests/FileManipulation/ThrowsBlockAdditionTest.php
@@ -20,7 +20,7 @@ function foo(string $s): string {
                     }',
                 '<?php
                     /**
-                     * @throws \InvalidArgumentException
+                     * @throws InvalidArgumentException
                      */
                     function foo(string $s): string {
                         if("" === $s) {
@@ -45,7 +45,7 @@ function foo(string $s): string {
                     }',
                 '<?php
                     /**
-                     * @throws \InvalidArgumentException|\DomainException
+                     * @throws InvalidArgumentException|DomainException
                      */
                     function foo(string $s): string {
                         if("" === $s) {
@@ -74,7 +74,7 @@ function foo(string $s): string {
                 '<?php
                     /**
                      * @throws InvalidArgumentException|DomainException
-                     * @throws \Exception
+                     * @throws Exception
                      */
                     function foo(string $s): string {
                         if("" === $s) {
@@ -103,7 +103,7 @@ function foo(string $s): string {
                 '<?php
                     /**
                      * @throws InvalidArgumentException
-                     * @throws \DomainException
+                     * @throws DomainException
                      */
                     function foo(string $s): string {
                         if("" === $s) {