Skip to content

Commit fb7b353

Browse files
committed
Add support for keys pstladr and cdtrpstladr.
Both are aliases for `dbtrpstladr`.
1 parent 01fe412 commit fb7b353

File tree

3 files changed

+22
-12
lines changed

3 files changed

+22
-12
lines changed

CHANGE_LOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Sephpa - Change Log
22
===============
33

4+
## 1.3.2 - Feb 23, 21
5+
- Added support for keys `pstladr` and `cdtrpstladr`. Both are aliases for `dbtrpstladr`.
6+
47
## 1.3.1 - Feb 14, 21
58
- Fixed: sanitizing of new `adrline` inputs was broken in case an array was used.
69
- SepaUtilities are now tested on PHP 8.0.

src/SepaUtilities.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ private static function getValFromMultiDimInput(array &$input, $keys)
643643
* 'ultmtcdrt','ultmtdbtr','rmtinf','orgnldbtracct_iban','iban','bic',
644644
* 'ccy','amendment', 'btchbookg','instdamt','seqtp','lclinstrm',
645645
* 'elctrncsgntr','reqdexctndt','purp','ctgypurp','orgnldbtragt', 'adrline'
646-
* 'ctry', 'dbtrpstladr'
646+
* 'ctry', 'dbtrpstladr', 'cdtrpstladr', 'pstladr'
647647
* @param mixed $input
648648
* @param array $options See `checkBIC()`, `checkIBAN()` and `checkLocalInstrument()` for
649649
* details. In addition one can use the key `version`, which is relevant
@@ -727,6 +727,8 @@ public static function check(string $field, $input, array $options = null)
727727
case 'ref':
728728
case 'orgnldbtragt': return $input; // nothing to check here
729729
case 'ctry': return self::checkCountryCode($input);
730+
case 'pstladr':
731+
case 'cdtrpstladr':
730732
case 'dbtrpstladr': if(is_array($input) && count($input) > 0 && count($input) <= 2)
731733
{
732734
foreach($input as $key => &$value)

tests/SepaUtilitiesTest.php

+16-11
Original file line numberDiff line numberDiff line change
@@ -521,17 +521,22 @@ public function testAdrLine()
521521
self::assertFalse(SepaUtilities::check('adrLine', ['test1','test2','test3']));
522522
}
523523

524-
public function testDbtrPstlAdr()
524+
public function testPstlAdr()
525525
{
526-
// valid
527-
self::assertSame(['ctry' => 'DE'], SepaUtilities::check('dbtrpstladr', ['ctry' => 'dE']));
528-
self::assertSame(['adrline' => 'test'], SepaUtilities::check('dbtrpstladr', ['adrline' => 'test']));
529-
self::assertSame(['adrline' => ['test']], SepaUtilities::check('dbtrpstladr', ['adrline' => ['test']]));
530-
self::assertSame(['ctry' => 'DE', 'adrLine' => ['test']], SepaUtilities::check('dbtrpstladr', ['ctry' => 'dE', 'adrLine' => ['test']]));
531-
532-
// invalid
533-
self::assertFalse(SepaUtilities::check('dbtrpstladr', []));
534-
self::assertFalse(SepaUtilities::check('dbtrpstladr', ['test' => 1]));
535-
self::assertFalse(SepaUtilities::check('dbtrpstladr', ['ctry' => 'dE', 'adrline' => ['test'], 'somethingelse' => 1]));
526+
foreach(['dbtrpstladr', 'cdtrpstladr', 'pstladr'] as $key)
527+
{
528+
// valid
529+
self::assertSame(['ctry' => 'DE'], SepaUtilities::check($key, ['ctry' => 'dE']));
530+
self::assertSame(['adrline' => 'test'], SepaUtilities::check($key, ['adrline' => 'test']));
531+
self::assertSame(['adrline' => ['test']], SepaUtilities::check($key, ['adrline' => ['test']]));
532+
self::assertSame(['ctry' => 'DE', 'adrLine' => ['test']], SepaUtilities::check($key, ['ctry' => 'dE', 'adrLine' => ['test']]));
533+
534+
// invalid
535+
self::assertFalse(SepaUtilities::check($key, []));
536+
self::assertFalse(SepaUtilities::check($key, ['test' => 1]));
537+
self::assertFalse(SepaUtilities::check($key, ['ctry' => 'dE',
538+
'adrline' => ['test'],
539+
'somethingelse' => 1]));
540+
}
536541
}
537542
}

0 commit comments

Comments
 (0)