From 5ea78560dc6abb203c0ce7deaad7920ad8af964c Mon Sep 17 00:00:00 2001 From: Steve Bauman Date: Wed, 21 May 2025 09:13:34 -0400 Subject: [PATCH] Use ImapConnectionException as abstract base class for all ImapConnectionExceptions --- src/Connection/ImapConnection.php | 3 +-- src/Exceptions/ImapConnectionClosedException.php | 2 +- src/Exceptions/ImapConnectionException.php | 2 +- src/Exceptions/ImapConnectionFailedException.php | 2 +- src/Exceptions/ImapConnectionTimedOutException.php | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Connection/ImapConnection.php b/src/Connection/ImapConnection.php index 82990b8..21e1975 100644 --- a/src/Connection/ImapConnection.php +++ b/src/Connection/ImapConnection.php @@ -17,7 +17,6 @@ use DirectoryTree\ImapEngine\Exceptions\Exception; use DirectoryTree\ImapEngine\Exceptions\ImapCommandException; use DirectoryTree\ImapEngine\Exceptions\ImapConnectionClosedException; -use DirectoryTree\ImapEngine\Exceptions\ImapConnectionException; use DirectoryTree\ImapEngine\Exceptions\ImapConnectionFailedException; use DirectoryTree\ImapEngine\Exceptions\ImapConnectionTimedOutException; use DirectoryTree\ImapEngine\Exceptions\ImapResponseException; @@ -749,7 +748,7 @@ protected function nextReply(): Data|Token|Response|null throw match (true) { $meta['timed_out'] ?? false => new ImapConnectionTimedOutException('Stream timed out, no response'), $meta['eof'] ?? false => new ImapConnectionClosedException('Server closed the connection (EOF)'), - default => new ImapConnectionException('Unknown stream error. Metadata: '.json_encode($meta)), + default => new ImapConnectionFailedException('Unknown stream error. Metadata: '.json_encode($meta)), }; } diff --git a/src/Exceptions/ImapConnectionClosedException.php b/src/Exceptions/ImapConnectionClosedException.php index 250d6ff..8323ba7 100644 --- a/src/Exceptions/ImapConnectionClosedException.php +++ b/src/Exceptions/ImapConnectionClosedException.php @@ -2,4 +2,4 @@ namespace DirectoryTree\ImapEngine\Exceptions; -class ImapConnectionClosedException extends Exception {} +class ImapConnectionClosedException extends ImapConnectionException {} diff --git a/src/Exceptions/ImapConnectionException.php b/src/Exceptions/ImapConnectionException.php index c272f5c..509bbc5 100644 --- a/src/Exceptions/ImapConnectionException.php +++ b/src/Exceptions/ImapConnectionException.php @@ -2,4 +2,4 @@ namespace DirectoryTree\ImapEngine\Exceptions; -class ImapConnectionException extends Exception {} +abstract class ImapConnectionException extends Exception {} diff --git a/src/Exceptions/ImapConnectionFailedException.php b/src/Exceptions/ImapConnectionFailedException.php index d4ebc61..5675dea 100644 --- a/src/Exceptions/ImapConnectionFailedException.php +++ b/src/Exceptions/ImapConnectionFailedException.php @@ -2,4 +2,4 @@ namespace DirectoryTree\ImapEngine\Exceptions; -class ImapConnectionFailedException extends Exception {} +class ImapConnectionFailedException extends ImapConnectionException {} diff --git a/src/Exceptions/ImapConnectionTimedOutException.php b/src/Exceptions/ImapConnectionTimedOutException.php index 6c4a555..c8098b0 100644 --- a/src/Exceptions/ImapConnectionTimedOutException.php +++ b/src/Exceptions/ImapConnectionTimedOutException.php @@ -2,4 +2,4 @@ namespace DirectoryTree\ImapEngine\Exceptions; -class ImapConnectionTimedOutException extends Exception {} +class ImapConnectionTimedOutException extends ImapConnectionException {}