From 12d6d21abb85f90105743767366dac62de52fece Mon Sep 17 00:00:00 2001
From: Santiago San Martin <sanmartindev@gmail.com>
Date: Wed, 21 May 2025 23:21:01 -0300
Subject: [PATCH] [Console][Messenger] Fix: Allow
 UnrecoverableExceptionInterface to bypass retry in RunCommandMessageHandler

Co-authored-by: Kevin Bond <kevinbond@gmail.com>
---
 Messenger/RunCommandMessageHandler.php        |  4 ++
 .../RunCommandMessageHandlerTest.php          | 46 +++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/Messenger/RunCommandMessageHandler.php b/Messenger/RunCommandMessageHandler.php
index 14f9c176..2d698c73 100644
--- a/Messenger/RunCommandMessageHandler.php
+++ b/Messenger/RunCommandMessageHandler.php
@@ -16,6 +16,8 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\RunCommandFailedException;
 use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\Messenger\Exception\RecoverableExceptionInterface;
+use Symfony\Component\Messenger\Exception\UnrecoverableExceptionInterface;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
@@ -35,6 +37,8 @@ final class RunCommandMessageHandler
 
         try {
             $exitCode = $this->application->run($input, $output);
+        } catch (UnrecoverableExceptionInterface|RecoverableExceptionInterface $e) {
+            throw $e;
         } catch (\Throwable $e) {
             throw new RunCommandFailedException($e, new RunCommandContext($message, Command::FAILURE, $output->fetch()));
         }
diff --git a/Tests/Messenger/RunCommandMessageHandlerTest.php b/Tests/Messenger/RunCommandMessageHandlerTest.php
index adc31e0e..3d8e3e19 100644
--- a/Tests/Messenger/RunCommandMessageHandlerTest.php
+++ b/Tests/Messenger/RunCommandMessageHandlerTest.php
@@ -20,6 +20,10 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Messenger\RunCommandMessage;
 use Symfony\Component\Console\Messenger\RunCommandMessageHandler;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Messenger\Exception\RecoverableExceptionInterface;
+use Symfony\Component\Messenger\Exception\RecoverableMessageHandlingException;
+use Symfony\Component\Messenger\Exception\UnrecoverableExceptionInterface;
+use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
@@ -81,6 +85,38 @@ final class RunCommandMessageHandlerTest extends TestCase
         $this->fail('Exception not thrown.');
     }
 
+    public function testExecutesCommandThatThrownUnrecoverableException()
+    {
+        $handler = new RunCommandMessageHandler($this->createApplicationWithCommand());
+
+        try {
+            $handler(new RunCommandMessage('test:command --throw-unrecoverable'));
+        } catch (UnrecoverableExceptionInterface $e) {
+            $this->assertSame('Unrecoverable exception message', $e->getMessage());
+            $this->assertNull($e->getPrevious());
+
+            return;
+        }
+
+        $this->fail('Exception not thrown.');
+    }
+
+    public function testExecutesCommandThatThrownRecoverableException()
+    {
+        $handler = new RunCommandMessageHandler($this->createApplicationWithCommand());
+
+        try {
+            $handler(new RunCommandMessage('test:command --throw-recoverable'));
+        } catch (RecoverableExceptionInterface $e) {
+            $this->assertSame('Recoverable exception message', $e->getMessage());
+            $this->assertNull($e->getPrevious());
+
+            return;
+        }
+
+        $this->fail('Exception not thrown.');
+    }
+
     private function createApplicationWithCommand(): Application
     {
         $application = new Application();
@@ -92,6 +128,8 @@ final class RunCommandMessageHandlerTest extends TestCase
                     $this
                         ->setName('test:command')
                         ->addOption('throw')
+                        ->addOption('throw-unrecoverable')
+                        ->addOption('throw-recoverable')
                         ->addOption('exit', null, InputOption::VALUE_REQUIRED, 0)
                     ;
                 }
@@ -100,6 +138,14 @@ final class RunCommandMessageHandlerTest extends TestCase
                 {
                     $output->write('some message');
 
+                    if ($input->getOption('throw-unrecoverable')) {
+                        throw new UnrecoverableMessageHandlingException('Unrecoverable exception message');
+                    }
+
+                    if ($input->getOption('throw-recoverable')) {
+                        throw new RecoverableMessageHandlingException('Recoverable exception message');
+                    }
+
                     if ($input->getOption('throw')) {
                         throw new \RuntimeException('exception message');
                     }