update tests for php8.1

OXID-eSales · Dec 2, 2024 · 25d24ab · 25d24ab
1 parent 5c8f693
commit 25d24ab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Tests/Codeception/Acceptance/SofortCest.php b/Tests/Codeception/Acceptance/SofortCest.php
@@ -38,7 +38,7 @@ protected function getOXID(): array
     public function _before(AcceptanceTester $I): void
     {
         parent::_before($I);
-        $I->resetCookie([]);
+        $I->resetCookie();
     }
 
     /**

diff --git a/Tests/Unit/Controller/DispatcherControllerTest.php b/Tests/Unit/Controller/DispatcherControllerTest.php
@@ -31,7 +31,7 @@ public function testFinalizeTmpOrderExecutesCorrectly()
             'OXID' => 'testTmpOrderId',
             'TMPORDER' => base64_encode(serialize(['order' => $order]))
         ];
-
+        /** @var DispatcherController $controller */
         $controller = $this->getDispatcherControllerPartialMock();
 
         $result = $controller->finalizeTmpOrder($paymentMock, $tmpOrderMock, $tmpData, false);

diff --git a/Tests/Unit/Service/FlexibleSerializerOrderTest.php b/Tests/Unit/Service/FlexibleSerializerOrderTest.php
@@ -1,16 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Service;
 
-use OxidSolutionCatalysts\Unzer\Model\Order;
-use OxidEsales\Eshop\Core\Field;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidSolutionCatalysts\Unzer\Service\FlexibleSerializer;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
 class FlexibleSerializerOrderTest extends TestCase
 {
-    private $flexibleSerializer;
+    private ?FlexibleSerializer $flexibleSerializer;
 
     protected function setUp(): void
     {

diff --git a/src/Service/FlexibleSerializer.php b/src/Service/FlexibleSerializer.php
@@ -60,6 +60,10 @@ public function restoreOrderFromStrClass(string $serialized): ?Order
 
         $order = $this->getOrderModel();
 
+        if (!$unserializedData) {
+            return $order;
+        }
+
         foreach (get_object_vars($unserializedData) as $property => $value) {
             if (property_exists($order, $property) || method_exists($order, 'setFieldData')) {
                 if (method_exists($order, 'setFieldData')) {