Release 2.9.0 (#4526)
* added fix to work around bc break in new phpword version * fix phpoffice deprecations * mark unused option as deprecated * support for DateTimeInterface and DateTimeImmutable where possible * use TRUSTED_PROXIES setting - fixes #4533 * re-enable Kimai test in docker test build script (#4541) * bump dependencies
This commit is contained in:
@@ -17,6 +17,7 @@ use App\Entity\Team;
|
||||
use App\Form\Model\DateRange;
|
||||
use App\Repository\Query\ActivityQuery;
|
||||
use App\Repository\Query\BaseQuery;
|
||||
use App\Repository\Query\DateRangeInterface;
|
||||
use App\Repository\Query\ProjectQuery;
|
||||
use App\Repository\Query\TimesheetQuery;
|
||||
use App\Utils\SearchTerm;
|
||||
@@ -334,7 +335,7 @@ class BaseQueryTest extends TestCase
|
||||
$this->assertEquals([13, 27], $sut->getProjectIds());
|
||||
}
|
||||
|
||||
protected function assertDateRangeTrait($sut): void
|
||||
protected function assertDateRangeTrait(DateRangeInterface $sut): void
|
||||
{
|
||||
self::assertNull($sut->getBegin());
|
||||
self::assertNull($sut->getEnd());
|
||||
@@ -346,14 +347,15 @@ class BaseQueryTest extends TestCase
|
||||
self::assertNull($sut->getBegin());
|
||||
self::assertNull($sut->getEnd());
|
||||
|
||||
$begin = new \DateTime('2013-11-23 13:45:07');
|
||||
$end = new \DateTime('2014-01-01 23:45:11');
|
||||
$dateRange->setBegin($begin);
|
||||
$dateRange->setEnd($end);
|
||||
$dateRange->setBegin(new \DateTimeImmutable('2013-11-23 13:45:07'));
|
||||
$dateRange->setEnd(new \DateTimeImmutable('2014-01-01 23:45:11'));
|
||||
|
||||
self::assertSame($begin, $sut->getDateRange()->getBegin());
|
||||
self::assertSame($begin, $sut->getBegin());
|
||||
self::assertSame($end, $sut->getDateRange()->getEnd());
|
||||
self::assertSame($end, $sut->getEnd());
|
||||
$begin1 = new \DateTimeImmutable('2013-11-23 00:00:00');
|
||||
$end1 = new \DateTimeImmutable('2014-01-01 23:59:59');
|
||||
|
||||
self::assertEquals($begin1, $sut->getDateRange()->getBegin());
|
||||
self::assertEquals($begin1, $sut->getBegin());
|
||||
self::assertEquals($end1, $sut->getDateRange()->getEnd());
|
||||
self::assertEquals($end1, $sut->getEnd());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user