Serialize BaseAction::pollingInfo and vopConfirmationRequest

Author: Philipp91

lib/Fhp/BaseAction.php

@@ -97,6 +97,8 @@ public function __serialize(): array
             $this->requestSegmentNumbers,
             $this->tanRequest,
             $this->needTanForSegment,
+            $this->pollingInfo,
+            $this->vopConfirmationRequest,
         ];
     }
 
@@ -117,7 +119,9 @@ public function __unserialize(array $serialized): void
             $this->requestSegmentNumbers,
             $this->tanRequest,
             $this->needTanForSegment,
-        ) = $serialized;
+            $this->pollingInfo,
+            $this->vopConfirmationRequest,
+        ) = array_pad($serialized, 5, null);
     }
 
     /**

lib/Tests/Fhp/BaseActionVopSerializationTest.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Fhp;
+
+use Tests\Fhp\Integration\Atruvia\SendTransferVoPTest;
+
+class BaseActionVopSerializationTest extends SendTransferVoPTest
+{
+    /**
+     * @throws \Throwable
+     */
+    public function testSerializesPollingInfo()
+    {
+        // We piggy-back on the Atruvia integration test to provide an action that has some reasonable data inside and
+        // has already been executed so that polling is now required.
+        $this->initDialog();
+        $originalAction = $this->createAction();
+        $this->expectMessage(static::SEND_TRANSFER_REQUEST, mb_convert_encoding(static::SEND_TRANSFER_RESPONSE_POLLING_NEEDED, 'ISO-8859-1', 'UTF-8'));
+        $this->fints->execute($originalAction);
+
+        // Sanity-check that the polling is now expected.
+        $this->assertNotNull($originalAction->getPollingInfo());
+
+        // Do a serialization roundtrip.
+        $serializedAction = serialize($originalAction);
+        $unserializedAction = unserialize($serializedAction);
+
+        // Verify that the polling info is still the same.
+        $this->assertEquals($originalAction->getPollingInfo(), $unserializedAction->getPollingInfo());
+    }
+
+    /**
+     * @throws \Throwable
+     */
+    public function testSerializesVopConfirmationRequest()
+    {
+        // We piggy-back on the Atruvia integration test to provide an action that has some reasonable data inside and
+        // has already been executed so that polling is now required.
+        $this->initDialog();
+        $originalAction = $this->createAction();
+        $this->expectMessage(static::SEND_TRANSFER_REQUEST, mb_convert_encoding(static::SEND_TRANSFER_RESPONSE_POLLING_NEEDED, 'ISO-8859-1', 'UTF-8'));
+        $response = static::buildVopReportResponse(static::VOP_REPORT_PARTIAL_MATCH_RESPONSE, static::VOP_REPORT_PARTIAL_MATCH_XML_PAYLOAD);
+        $this->expectMessage(static::POLL_VOP_REQUEST, $response);
+        $this->fints->execute($originalAction);
+        $this->assertTrue($originalAction->needsPollingWait());
+        $this->fints->pollAction($originalAction);
+
+        // Sanity-check that the VOP confirmation is now expected.
+        $this->assertNotNull($originalAction->getVopConfirmationRequest());
+
+        // Do a serialization roundtrip.
+        $serializedAction = serialize($originalAction);
+        $unserializedAction = unserialize($serializedAction);
+
+        // Verify that the polling info is still the same.
+        $this->assertEquals($originalAction->getVopConfirmationRequest(), $unserializedAction->getVopConfirmationRequest());
+    }
+}

lib/Tests/Fhp/Integration/Atruvia/SendTransferVoPTest.php

@@ -49,7 +49,7 @@ class SendTransferVoPTest extends AtruviaIntegrationTestBase
     public function testVopWithResultMatchButConfirmationRequired(): void
     {
         $this->initDialog();
-        $action = SendSEPATransfer::create($this->getTestAccount(), self::XML_PAYLOAD);
+        $action = $this->createAction();
 
         // We send the transfer and the bank asks to wait while VOP is happening.
         $this->expectMessage(static::SEND_TRANSFER_REQUEST, mb_convert_encoding(static::SEND_TRANSFER_RESPONSE_POLLING_NEEDED, 'ISO-8859-1', 'UTF-8'));
@@ -104,7 +104,7 @@ public function testVopWithResultMatchButConfirmationRequired(): void
     public function testVopWithResultPartialMatch(): void
     {
         $this->initDialog();
-        $action = SendSEPATransfer::create($this->getTestAccount(), self::XML_PAYLOAD);
+        $action = $this->createAction();
 
         // We send the transfer and the bank asks to wait while VOP is happening.
         $this->expectMessage(static::SEND_TRANSFER_REQUEST, mb_convert_encoding(static::SEND_TRANSFER_RESPONSE_POLLING_NEEDED, 'ISO-8859-1', 'UTF-8'));