Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Fhp\Segment\VPP;
namespace Fhp\Segment\VPA;

use Fhp\Segment\BaseSegment;
use Fhp\Syntax\Bin;
Expand All @@ -14,4 +14,4 @@
class HKVPAv1 extends BaseSegment
{
public Bin $vopId;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Fhp\Segment\BaseDeg;

class ErgebnisVopPruefungEinzeltransaktion extends BaseDeg
class ErgebnisVopPruefungEinzeltransaktionV1 extends BaseDeg
{
public string $ibanEmpfaenger;

Expand All @@ -18,4 +18,4 @@ class ErgebnisVopPruefungEinzeltransaktion extends BaseDeg
public string $vopPruefergebnis;

public ?string $grundRVNA = null;
}
}
2 changes: 1 addition & 1 deletion lib/Fhp/Segment/VPP/HIVPPSv1.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
*/
class HIVPPSv1 extends BaseGeschaeftsvorfallparameter
{
public ParameterNamensabgleichPruefauftrag $parameter;
public ParameterNamensabgleichPruefauftragV1 $parameter;
}
4 changes: 2 additions & 2 deletions lib/Fhp/Segment/VPP/HIVPPv1.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ class HIVPPv1 extends BaseSegment

public ?Bin $paymentStatusReport = null;

public ?ErgebnisVopPruefungEinzeltransaktion $ergebnisVopPruefungEinzeltransaktion = null;
public ?ErgebnisVopPruefungEinzeltransaktionV1 $ergebnisVopPruefungEinzeltransaktion = null;

public ?string $aufklaerungstextAutorisierungTrotzAbweichung = null;

// This value is in seconds
public ?int $wartezeitVorNaechsterAbfrage = null;
}
}
8 changes: 4 additions & 4 deletions lib/Fhp/Segment/VPP/HKVPPv1.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
class HKVPPv1 extends BaseSegment
{
public UnterstuetztePaymentStatusReports $unterstuetztePaymentStatusReports;
public UnterstuetztePaymentStatusReportsV1 $unterstuetztePaymentStatusReports;

public ?Bin $pollingId = null;

/** Only allowed if {@link ParameterNamensabgleichPruefauftrag::$eingabeAnzahlEintraegeErlaubt} says so. */
/** Only allowed if {@link ParameterNamensabgleichPruefauftragV1::$eingabeAnzahlEintraegeErlaubt} says so. */
public ?int $maximaleAnzahlEintraege = null;

/** For pagination. Max length: 35 */
Expand All @@ -26,7 +26,7 @@ class HKVPPv1 extends BaseSegment
public static function createEmpty(): static
{
$hkvpp = parent::createEmpty();
$hkvpp->unterstuetztePaymentStatusReports = new UnterstuetztePaymentStatusReports();
$hkvpp->unterstuetztePaymentStatusReports = new UnterstuetztePaymentStatusReportsV1();
return $hkvpp;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@

use Fhp\Segment\BaseDeg;

class ParameterNamensabgleichPruefauftrag extends BaseDeg
/**
* DEG: Parameter Namensabgleich Prüfauftrag
*
* @see FinTS_3.0_Messages_Geschaeftsvorfaelle_VOP_1.01_2025_06_27_FV.pdf
* Section: D
*/
class ParameterNamensabgleichPruefauftragV1 extends BaseDeg
{
public int $maximaleAnzahlCreditTransferTransactionInformationOptIn;

Expand All @@ -21,4 +27,4 @@ class ParameterNamensabgleichPruefauftrag extends BaseDeg

/** @var string[] @Max(999999) Max length each: 6 */
public array $vopPflichtigerZahlungsverkehrsauftrag;
}
}
11 changes: 0 additions & 11 deletions lib/Fhp/Segment/VPP/UnterstuetztePaymentStatusReports.php

This file was deleted.

20 changes: 20 additions & 0 deletions lib/Fhp/Segment/VPP/UnterstuetztePaymentStatusReportsV1.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace Fhp\Segment\VPP;

use Fhp\Segment\BaseDeg;

/**
* DEG: Unterstützte Payment Status Reports
*
* @see FinTS_3.0_Messages_Geschaeftsvorfaelle_VOP_1.01_2025_06_27_FV.pdf
*
* The specification doesn't actually specify the contents of this DEG. In section C.10.7.1.1 a), it's used, but not
* specified anywhere. We have to infer its contents indirectly, and we align with what other FinTS libraries do:
* - https://github.com/hbci4j/hbci4java/blob/f5dd47fca7b4cf1163ac1b955495dec1b195340e/src/main/resources/hbci-300.xml#L2207-L2209
*/
class UnterstuetztePaymentStatusReportsV1 extends BaseDeg
{
/** @var string[] @Max(99) Max length each: 256 */
public array $paymentStatusReportDescriptor;
}