From 5d7e0394a080158812a6765d88aabe99596e3da2 Mon Sep 17 00:00:00 2001
From: fds2610-bot <felix-bot@schepmann.de>
Date: Wed, 30 Sep 2026 14:26:00 +0200
Subject: [PATCH] Support HKWPD/HIWPD/HIWPDS version 6 for the depot statement

DKB announces HIWPDS only in version 6, so GetDepotAufstellung failed with
'The server does not support any HIWPDS versions implemented in this library'.
Also declares the pagination token for the new request segment.
---
 Tests/Unit/Segment/HKWPDTest.php   | 36 ++++++++++++++++++++++++++++++
 src/Action/GetDepotAufstellung.php |  9 +++++++-
 src/Segment/WPD/HIWPDSv6.php       | 22 ++++++++++++++++++
 src/Segment/WPD/HIWPDv6.php        | 24 ++++++++++++++++++++
 src/Segment/WPD/HKWPDv6.php        | 35 +++++++++++++++++++++++++++++
 5 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 Tests/Unit/Segment/HKWPDTest.php
 create mode 100644 src/Segment/WPD/HIWPDSv6.php
 create mode 100644 src/Segment/WPD/HIWPDv6.php
 create mode 100644 src/Segment/WPD/HKWPDv6.php

diff --git a/Tests/Unit/Segment/HKWPDTest.php b/Tests/Unit/Segment/HKWPDTest.php
new file mode 100644
index 00000000..6da4bf91
--- /dev/null
+++ b/Tests/Unit/Segment/HKWPDTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Fhp\Tests\Unit\Segment;
+
+use Fhp\Segment\Common\Kik;
+use Fhp\Segment\Common\KtvV3;
+use Fhp\Segment\WPD\HIWPDSv6;
+use Fhp\Segment\WPD\HKWPDv6;
+use Fhp\Syntax\Parser;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Depotaufstellung in Version 6, wie sie die DKB in ihren Bankparametern meldet.
+ */
+class HKWPDTest extends TestCase
+{
+    public function testParametersOfVersion6()
+    {
+        /** @var HIWPDSv6 $hiwpds */
+        $hiwpds = Parser::parseSegment("HIWPDS:60:6:3+1+1+0+N:N:N'", HIWPDSv6::class);
+        $this->assertEquals(6, $hiwpds->getVersion());
+        $this->assertFalse($hiwpds->getParameter()->getEingabeAnzahlEintraegeErlaubt());
+        $this->assertFalse($hiwpds->getParameter()->getWaehrungDepotaufstellungWaehlbar());
+        $this->assertFalse($hiwpds->getParameter()->getKursqualitaetWaehlbar());
+    }
+
+    public function testRequestOfVersion6()
+    {
+        $hkwpd = HKWPDv6::create(KtvV3::create('502022353', null, Kik::create('12030000')));
+        $hkwpd->setSegmentNumber(3);
+        $this->assertEquals("HKWPD:3:6+502022353::280:12030000'", $hkwpd->serialize());
+
+        $hkwpd->setPaginationToken('TOKEN');
+        $this->assertEquals("HKWPD:3:6+502022353::280:12030000++++TOKEN'", $hkwpd->serialize());
+    }
+}
diff --git a/src/Action/GetDepotAufstellung.php b/src/Action/GetDepotAufstellung.php
index 17e644e3..c67493b2 100644
--- a/src/Action/GetDepotAufstellung.php
+++ b/src/Action/GetDepotAufstellung.php
@@ -15,7 +15,9 @@
 use Fhp\Segment\WPD\HIWPD;
 use Fhp\Segment\WPD\HIWPDS;
 use Fhp\Segment\WPD\HIWPDv5;
+use Fhp\Segment\WPD\HIWPDv6;
 use Fhp\Segment\WPD\HKWPDv5;
+use Fhp\Segment\WPD\HKWPDv6;
 use Fhp\UnsupportedException;
 
 /**
@@ -119,6 +121,8 @@ protected function createRequest(BPD $bpd, ?UPD $upd)
         switch ($hiwpds->getVersion()) {
             case 5:
                 return HKWPDv5::create(KtvV3::fromAccount($this->account));
+            case 6:
+                return HKWPDv6::create(KtvV3::fromAccount($this->account));
             default:
                 throw new UnsupportedException('Unsupported HKWPD version: ' . $hiwpds->getVersion());
         }
@@ -129,7 +133,10 @@ public function processResponse(Message $response)
         parent::processResponse($response);
 
         $isUnavailable = $response->findRueckmeldung(Rueckmeldungscode::NICHT_VERFUEGBAR) !== null;
-        $responseHiwpd = $response->findSegments(HIWPDv5::class);
+        $responseHiwpd = array_merge(
+            $response->findSegments(HIWPDv5::class),
+            $response->findSegments(HIWPDv6::class)
+        );
 
         $numResponseSegments = count($responseHiwpd);
         if (!$isUnavailable && $numResponseSegments < count($this->getRequestSegmentNumbers())) {
diff --git a/src/Segment/WPD/HIWPDSv6.php b/src/Segment/WPD/HIWPDSv6.php
new file mode 100644
index 00000000..70d6ae84
--- /dev/null
+++ b/src/Segment/WPD/HIWPDSv6.php
@@ -0,0 +1,22 @@
+<?php
+/** @noinspection PhpUnused */
+
+namespace Fhp\Segment\WPD;
+
+use Fhp\Segment\BaseGeschaeftsvorfallparameter;
+
+/**
+ * Segment: Parameter Depotaufstellung
+ *
+ * @link https://www.hbci-zka.de/dokumente/spezifikation_deutsch/fintsv3/FinTS_3.0_Messages_Geschaeftsvorfaelle_2015-08-07_final_version.pdf
+ * Section: O - Parameter Depotaufstellung
+ */
+class HIWPDSv6 extends BaseGeschaeftsvorfallparameter implements HIWPDS
+{
+    public ParameterDepotaufstellungV2 $parameter;
+
+    public function getParameter(): ParameterDepotaufstellung
+    {
+        return $this->parameter;
+    }
+}
diff --git a/src/Segment/WPD/HIWPDv6.php b/src/Segment/WPD/HIWPDv6.php
new file mode 100644
index 00000000..efdae189
--- /dev/null
+++ b/src/Segment/WPD/HIWPDv6.php
@@ -0,0 +1,24 @@
+<?php
+/** @noinspection PhpUnused */
+
+namespace Fhp\Segment\WPD;
+
+use Fhp\Segment\BaseSegment;
+use Fhp\Syntax\Bin;
+
+/**
+ * Segment: Depotaufstellung Kreditinstitutsrückmledung (Version 6)
+ *
+ * @link https://www.hbci-zka.de/dokumente/spezifikation_deutsch/fintsv3/FinTS_3.0_Messages_Geschaeftsvorfaelle_2015-08-07_final_version.pdf
+ * Section: C.4.3.1b
+ */
+class HIWPDv6 extends BaseSegment implements HIWPD
+{
+    /** Uses SWIFT format MT353, version SRG 1998 */
+    public Bin $depotaufstellung;
+
+    public function getDepotaufstellung(): Bin
+    {
+        return $this->depotaufstellung;
+    }
+}
diff --git a/src/Segment/WPD/HKWPDv6.php b/src/Segment/WPD/HKWPDv6.php
new file mode 100644
index 00000000..90410943
--- /dev/null
+++ b/src/Segment/WPD/HKWPDv6.php
@@ -0,0 +1,35 @@
+<?php
+/** @noinspection PhpUnused */
+
+namespace Fhp\Segment\WPD;
+
+use Fhp\Segment\BaseSegment;
+use Fhp\Segment\Paginateable;
+
+/**
+ * Segment: Depotaufstellung anfordern (Version 6)
+ *
+ * @link https://www.hbci-zka.de/dokumente/spezifikation_deutsch/fintsv3/FinTS_3.0_Messages_Geschaeftsvorfaelle_2015-08-07_final_version.pdf
+ * Section: C.4.3.1a
+ */
+class HKWPDv6 extends BaseSegment implements Paginateable
+{
+    public \Fhp\Segment\Common\KtvV3 $depot;
+    public ?string $waehrungDerDepotaufstellung = null;
+    public ?\Fhp\Segment\Common\Kursqualitaet $kursqualitaet = null;
+    /** Only allowed if {@link ParameterDepotaufstellungV2::$eingabeAnzahlEintraegeErlaubt} says so. */
+    public ?int $maximaleAnzahlEintraege = null;
+    public ?string $aufsetzpunkt = null;
+
+    public static function create(\Fhp\Segment\Common\KtvV3 $ktv): HKWPDv6
+    {
+        $result = HKWPDv6::createEmpty();
+        $result->depot = $ktv;
+        return $result;
+    }
+
+    public function setPaginationToken(string $paginationToken)
+    {
+        $this->aufsetzpunkt = $paginationToken;
+    }
+}