From 224057b8077883469426abec34c7c0636fe7090e Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Wed, 20 Jul 2022 11:57:58 +0200
Subject: [PATCH] enable Link Mobility php client v2 as dependency variant

---
 composer.json                                | 2 +-
 src/Application/Model/OrderRecipients.php    | 4 +++-
 src/Application/Model/UserRecipients.php     | 4 +++-
 src/Modules/Application/Model/OrderModel.php | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 69b9cc6..7ca2bda 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
     "require": {
         "php": "^7.0 || ^8.0",
         "oxid-esales/oxideshop-ce": "6.7 - 6.10",
-        "d3/linkmobility-php-client": "^1.2.0"
+        "d3/linkmobility-php-client": "^1.2.0 || ^2.0.0"
     },
     "extra": {
       "oxideshop": {
diff --git a/src/Application/Model/OrderRecipients.php b/src/Application/Model/OrderRecipients.php
index 04603b9..788732e 100644
--- a/src/Application/Model/OrderRecipients.php
+++ b/src/Application/Model/OrderRecipients.php
@@ -57,7 +57,9 @@ class OrderRecipients
             }
         }
 
-        throw oxNew(noRecipientFoundException::class);
+        /** @var noRecipientFoundException $exc */
+        $exc = oxNew(noRecipientFoundException::class);
+        throw $exc;
     }
 
     /**
diff --git a/src/Application/Model/UserRecipients.php b/src/Application/Model/UserRecipients.php
index 6152f6a..c5fbaf6 100644
--- a/src/Application/Model/UserRecipients.php
+++ b/src/Application/Model/UserRecipients.php
@@ -57,7 +57,9 @@ class UserRecipients
             }
         }
 
-        throw oxNew(noRecipientFoundException::class);
+        /** @var noRecipientFoundException $exc */
+        $exc = oxNew(noRecipientFoundException::class);
+        throw $exc;
     }
 
     /**
diff --git a/src/Modules/Application/Model/OrderModel.php b/src/Modules/Application/Model/OrderModel.php
index f8b2199..b8ff5d5 100644
--- a/src/Modules/Application/Model/OrderModel.php
+++ b/src/Modules/Application/Model/OrderModel.php
@@ -15,6 +15,7 @@ declare(strict_types=1);
 
 namespace D3\Linkmobility4OXID\Modules\Application\Model;
 
+use D3\Linkmobility4OXID\Modules\Core\EmailCore;
 use OxidEsales\Eshop\Core\Email;
 
 class OrderModel extends OrderModel_parent
@@ -24,6 +25,7 @@ class OrderModel extends OrderModel_parent
         parent::cancelOrder();
 
         if ($this->getFieldData('oxstorno') === 1) {
+            /** @var EmailCore $Email */
             $Email = oxNew(Email::class);
             $Email->d3SendCancelMessage($this);
         }