mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-13 13:54:23 +00:00
in household, force validTo of address to be NULL
This commit is contained in:
parent
c7762dd6d2
commit
a4ece21f2b
@ -514,6 +514,8 @@ class Household
|
|||||||
|
|
||||||
if ($iterator->valid()) {
|
if ($iterator->valid()) {
|
||||||
$current->setValidTo($iterator->current()->getValidFrom());
|
$current->setValidTo($iterator->current()->getValidFrom());
|
||||||
|
} else {
|
||||||
|
$current->setValidTo(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -75,6 +75,7 @@ final class HouseholdTest extends TestCase
|
|||||||
|
|
||||||
$lastAddress = new Address();
|
$lastAddress = new Address();
|
||||||
$lastAddress->setValidFrom($yesterday = new DateTime('yesterday'));
|
$lastAddress->setValidFrom($yesterday = new DateTime('yesterday'));
|
||||||
|
$lastAddress->setValidTo(new DateTime('tomorrow'));
|
||||||
$household->addAddress($lastAddress);
|
$household->addAddress($lastAddress);
|
||||||
|
|
||||||
$this->assertNull($lastAddress->getValidTo());
|
$this->assertNull($lastAddress->getValidTo());
|
||||||
@ -82,6 +83,7 @@ final class HouseholdTest extends TestCase
|
|||||||
|
|
||||||
$previousAddress = new Address();
|
$previousAddress = new Address();
|
||||||
$previousAddress->setValidFrom($oneMonthAgo = new DateTime('1 month ago'));
|
$previousAddress->setValidFrom($oneMonthAgo = new DateTime('1 month ago'));
|
||||||
|
$previousAddress->setValidTo(new DateTime('now'));
|
||||||
$household->addAddress($previousAddress);
|
$household->addAddress($previousAddress);
|
||||||
|
|
||||||
$addresses = $household->getAddressesOrdered();
|
$addresses = $household->getAddressesOrdered();
|
||||||
@ -95,6 +97,7 @@ final class HouseholdTest extends TestCase
|
|||||||
|
|
||||||
$futureAddress = new Address();
|
$futureAddress = new Address();
|
||||||
$futureAddress->setValidFrom($tomorrow = new DateTime('tomorrow'));
|
$futureAddress->setValidFrom($tomorrow = new DateTime('tomorrow'));
|
||||||
|
$futureAddress->setValidTo(new DateTime('2150-01-01'));
|
||||||
$household->addAddress($futureAddress);
|
$household->addAddress($futureAddress);
|
||||||
|
|
||||||
$addresses = $household->getAddressesOrdered();
|
$addresses = $household->getAddressesOrdered();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user