From e74072eb4bb00ade73649ac06bc8f690e0348265 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@lekoala.be>
Date: Tue, 12 Nov 2024 15:12:26 +0100
Subject: [PATCH] fix merge

---
 src/thirdparty/Mandrill/Exceptions.php  | 155 +++++-------------------
 src/thirdparty/Mandrill/Exports.php     |   2 -
 src/thirdparty/Mandrill/Inbound.php     |   2 -
 src/thirdparty/Mandrill/Internal.php    |   2 -
 src/thirdparty/Mandrill/Ips.php         |   2 -
 src/thirdparty/Mandrill/Messages.php    |   2 -
 src/thirdparty/Mandrill/Metadata.php    |   2 -
 src/thirdparty/Mandrill/Rejects.php     |   2 -
 src/thirdparty/Mandrill/Senders.php     |   2 -
 src/thirdparty/Mandrill/Subaccounts.php |   2 -
 src/thirdparty/Mandrill/Tags.php        |   2 -
 src/thirdparty/Mandrill/Templates.php   |   2 -
 src/thirdparty/Mandrill/Urls.php        |   2 -
 src/thirdparty/Mandrill/Users.php       |   2 -
 src/thirdparty/Mandrill/Webhooks.php    |   2 -
 src/thirdparty/Mandrill/Whitelists.php  |   2 -
 16 files changed, 31 insertions(+), 154 deletions(-)

diff --git a/src/thirdparty/Mandrill/Exceptions.php b/src/thirdparty/Mandrill/Exceptions.php
index ba9210c..cbe0310 100644
--- a/src/thirdparty/Mandrill/Exceptions.php
+++ b/src/thirdparty/Mandrill/Exceptions.php
@@ -1,244 +1,151 @@
 <?php
 // @codingStandardsIgnoreStart
-class Mandrill_Error extends Exception
-{
+class Mandrill_Error extends Exception {}
 
-}
-
-class Mandrill_HttpError extends Mandrill_Error
-{
-
-}
+class Mandrill_HttpError extends Mandrill_Error {}
 
 /**
  * The parameters passed to the API call are invalid or not provided when required
  */
-class Mandrill_ValidationError extends Mandrill_Error
-{
-
-}
+class Mandrill_ValidationError extends Mandrill_Error {}
 
 /**
  * The provided API key is not a valid Mandrill API key
  */
-class Mandrill_Invalid_Key extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_Key extends Mandrill_Error {}
 
 /**
  * The requested feature requires payment.
  */
-class Mandrill_PaymentRequired extends Mandrill_Error
-{
-
-}
+class Mandrill_PaymentRequired extends Mandrill_Error {}
 
 /**
  * The provided subaccount id does not exist.
  */
-class Mandrill_Unknown_Subaccount extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_Subaccount extends Mandrill_Error {}
 
 /**
  * The requested template does not exist
  */
-class Mandrill_Unknown_Template extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_Template extends Mandrill_Error {}
 
 /**
  * The subsystem providing this API call is down for maintenance
  */
-class Mandrill_ServiceUnavailable extends Mandrill_Error
-{
-
-}
+class Mandrill_ServiceUnavailable extends Mandrill_Error {}
 
 /**
  * The provided message id does not exist.
  */
-class Mandrill_Unknown_Message extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_Message extends Mandrill_Error {}
 
 /**
  * The requested tag does not exist or contains invalid characters
  */
-class Mandrill_Invalid_Tag_Name extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_Tag_Name extends Mandrill_Error {}
 
 /**
  * The requested email is not in the rejection list
  */
-class Mandrill_Invalid_Reject extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_Reject extends Mandrill_Error {}
 
 /**
  * The requested sender does not exist
  */
-class Mandrill_Unknown_Sender extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_Sender extends Mandrill_Error {}
 
 /**
  * The requested URL has not been seen in a tracked link
  */
-class Mandrill_Unknown_Url extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_Url extends Mandrill_Error {}
 
 /**
  * The provided tracking domain does not exist.
  */
-class Mandrill_Unknown_TrackingDomain extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_TrackingDomain extends Mandrill_Error {}
 
 /**
  * The given template name already exists or contains invalid characters
  */
-class Mandrill_Invalid_Template extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_Template extends Mandrill_Error {}
 
 /**
  * The requested webhook does not exist
  */
-class Mandrill_Unknown_Webhook extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_Webhook extends Mandrill_Error {}
 
 /**
  * The requested inbound domain does not exist
  */
-class Mandrill_Unknown_InboundDomain extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_InboundDomain extends Mandrill_Error {}
 
 /**
  * The provided inbound route does not exist.
  */
-class Mandrill_Unknown_InboundRoute extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_InboundRoute extends Mandrill_Error {}
 
 /**
  * The requested export job does not exist
  */
-class Mandrill_Unknown_Export extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_Export extends Mandrill_Error {}
 
 /**
  * A dedicated IP cannot be provisioned while another request is pending.
  */
-class Mandrill_IP_ProvisionLimit extends Mandrill_Error
-{
-
-}
+class Mandrill_IP_ProvisionLimit extends Mandrill_Error {}
 
 /**
  * The provided dedicated IP pool does not exist.
  */
-class Mandrill_Unknown_Pool extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_Pool extends Mandrill_Error {}
 
 /**
  * The user hasn't started sending yet.
  */
-class Mandrill_NoSendingHistory extends Mandrill_Error
-{
-
-}
+class Mandrill_NoSendingHistory extends Mandrill_Error {}
 
 /**
  * The user's reputation is too low to continue.
  */
-class Mandrill_PoorReputation extends Mandrill_Error
-{
-
-}
+class Mandrill_PoorReputation extends Mandrill_Error {}
 
 /**
  * The provided dedicated IP does not exist.
  */
-class Mandrill_Unknown_IP extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_IP extends Mandrill_Error {}
 
 /**
  * You cannot remove the last IP from your default IP pool.
  */
-class Mandrill_Invalid_EmptyDefaultPool extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_EmptyDefaultPool extends Mandrill_Error {}
 
 /**
  * The default pool cannot be deleted.
  */
-class Mandrill_Invalid_DeleteDefaultPool extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_DeleteDefaultPool extends Mandrill_Error {}
 
 /**
  * Non-empty pools cannot be deleted.
  */
-class Mandrill_Invalid_DeleteNonEmptyPool extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_DeleteNonEmptyPool extends Mandrill_Error {}
 
 /**
  * The domain name is not configured for use as the dedicated IP's custom reverse DNS.
  */
-class Mandrill_Invalid_CustomDNS extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_CustomDNS extends Mandrill_Error {}
 
 /**
  * A custom DNS change for this dedicated IP is currently pending.
  */
-class Mandrill_Invalid_CustomDNSPending extends Mandrill_Error
-{
-
-}
+class Mandrill_Invalid_CustomDNSPending extends Mandrill_Error {}
 
 /**
  * Custom metadata field limit reached.
  */
-class Mandrill_Metadata_FieldLimit extends Mandrill_Error
-{
-
-}
+class Mandrill_Metadata_FieldLimit extends Mandrill_Error {}
 
 /**
  * The provided metadata field name does not exist.
  */
-class Mandrill_Unknown_MetadataField extends Mandrill_Error
-{
-
-}
+class Mandrill_Unknown_MetadataField extends Mandrill_Error {}
 // @codingStandardsIgnoreEnd
diff --git a/src/thirdparty/Mandrill/Exports.php b/src/thirdparty/Mandrill/Exports.php
index 672cab5..d0a289b 100644
--- a/src/thirdparty/Mandrill/Exports.php
+++ b/src/thirdparty/Mandrill/Exports.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Exports
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Inbound.php b/src/thirdparty/Mandrill/Inbound.php
index 61671f5..db6d24a 100644
--- a/src/thirdparty/Mandrill/Inbound.php
+++ b/src/thirdparty/Mandrill/Inbound.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Inbound
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Internal.php b/src/thirdparty/Mandrill/Internal.php
index e5854d3..817b550 100644
--- a/src/thirdparty/Mandrill/Internal.php
+++ b/src/thirdparty/Mandrill/Internal.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Internal
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Ips.php b/src/thirdparty/Mandrill/Ips.php
index c36dc06..c858678 100644
--- a/src/thirdparty/Mandrill/Ips.php
+++ b/src/thirdparty/Mandrill/Ips.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Ips
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Messages.php b/src/thirdparty/Mandrill/Messages.php
index 3487f9b..30a3052 100644
--- a/src/thirdparty/Mandrill/Messages.php
+++ b/src/thirdparty/Mandrill/Messages.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Messages
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Metadata.php b/src/thirdparty/Mandrill/Metadata.php
index c83e13d..4ae9ce2 100644
--- a/src/thirdparty/Mandrill/Metadata.php
+++ b/src/thirdparty/Mandrill/Metadata.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Metadata
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Rejects.php b/src/thirdparty/Mandrill/Rejects.php
index 1ad87f0..00bbc8f 100644
--- a/src/thirdparty/Mandrill/Rejects.php
+++ b/src/thirdparty/Mandrill/Rejects.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Rejects
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Senders.php b/src/thirdparty/Mandrill/Senders.php
index fdc02b2..910514a 100644
--- a/src/thirdparty/Mandrill/Senders.php
+++ b/src/thirdparty/Mandrill/Senders.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Senders
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Subaccounts.php b/src/thirdparty/Mandrill/Subaccounts.php
index 0a923ce..a7f5306 100644
--- a/src/thirdparty/Mandrill/Subaccounts.php
+++ b/src/thirdparty/Mandrill/Subaccounts.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Subaccounts
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Tags.php b/src/thirdparty/Mandrill/Tags.php
index 72f298a..ccdf2a3 100644
--- a/src/thirdparty/Mandrill/Tags.php
+++ b/src/thirdparty/Mandrill/Tags.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Tags
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Templates.php b/src/thirdparty/Mandrill/Templates.php
index a288fa9..f56ed41 100644
--- a/src/thirdparty/Mandrill/Templates.php
+++ b/src/thirdparty/Mandrill/Templates.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Templates
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Urls.php b/src/thirdparty/Mandrill/Urls.php
index 1ba2d61..42d4e59 100644
--- a/src/thirdparty/Mandrill/Urls.php
+++ b/src/thirdparty/Mandrill/Urls.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Urls
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Users.php b/src/thirdparty/Mandrill/Users.php
index 7d18aa0..d4fff3c 100644
--- a/src/thirdparty/Mandrill/Users.php
+++ b/src/thirdparty/Mandrill/Users.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Users
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Webhooks.php b/src/thirdparty/Mandrill/Webhooks.php
index 2a45cdf..81bd609 100644
--- a/src/thirdparty/Mandrill/Webhooks.php
+++ b/src/thirdparty/Mandrill/Webhooks.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Webhooks
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)
diff --git a/src/thirdparty/Mandrill/Whitelists.php b/src/thirdparty/Mandrill/Whitelists.php
index 2478f44..5ee33df 100644
--- a/src/thirdparty/Mandrill/Whitelists.php
+++ b/src/thirdparty/Mandrill/Whitelists.php
@@ -2,8 +2,6 @@
 
 class Mandrill_Whitelists
 {
-    protected $master;
-
     private $master;
 
     public function __construct(Mandrill $master)