Improving error message

Author: moufmouf

src/Rules/Exceptions/MustRethrowRule.php

@@ -35,15 +35,15 @@ public function getNodeType(): string
     public function processNode(Node $node, Scope $scope): array
     {
         // Let's only apply the filter to \Exception, \RuntimeException or \Throwable
-        $elected = false;
+        $exceptionType = null;
         foreach ($node->types as $type) {
             if (in_array((string)$type, [Exception::class, RuntimeException::class, Throwable::class], true)) {
-                $elected = true;
+                $exceptionType = (string)$type;
                 break;
             }
         }
 
-        if (!$elected) {
+        if ($exceptionType === null) {
             return [];
         }
 
@@ -76,7 +76,7 @@ public function isThrowFound(): bool
         $errors = [];
 
         if (!$visitor->isThrowFound()) {
-            $errors[] = sprintf('%scaught \Exception, \Throwable or \RuntimeException must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" to propagate the exception.', PrefixGenerator::generatePrefix($scope));
+            $errors[] = sprintf('%scaught "%s" must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" block to propagate the exception.', PrefixGenerator::generatePrefix($scope), $exceptionType);
         }
 
         return $errors;

tests/Rules/Exceptions/MustRethrowRuleTest.php

@@ -17,15 +17,15 @@ public function testCheckCatchedException()
     {
         $this->analyse([__DIR__ . '/data/must_rethrow.php'], [
             [
-                'caught \Exception, \Throwable or \RuntimeException must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" to propagate the exception.',
+                'caught "Exception" must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" block to propagate the exception.',
                 18,
             ],
             [
-                'caught \Exception, \Throwable or \RuntimeException must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" to propagate the exception.',
+                'caught "Throwable" must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" block to propagate the exception.',
                 24,
             ],
             [
-                'In function "TestCatch\foo", caught \Exception, \Throwable or \RuntimeException must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" to propagate the exception.',
+                'In function "TestCatch\foo", caught "RuntimeException" must be rethrown. Either catch a more specific exception or add a "throw" clause in the "catch" block to propagate the exception.',
                 31,
             ],
         ]);