Release 2.33.0 (#5438)

This commit is contained in:
Kevin Papst
2025-04-22 20:43:22 +02:00
committed by GitHub
parent a70c803158
commit e663cc2b02
58 changed files with 1404 additions and 899 deletions

View File

@@ -57,92 +57,83 @@ class ActivityUserInvoiceCalculatorTest extends AbstractCalculatorTestCase
$activity3->method('getId')->willReturn(3);
$timesheet = new Timesheet();
$timesheet
->setBegin(new \DateTime())
->setEnd(new \DateTime())
->setDuration(3600)
->setRate(293.27)
->setUser($user1)
->setActivity($activity1)
->setProject((new Project())->setName('bar'));
$timesheet->setBegin(new \DateTime());
$timesheet->setEnd(new \DateTime());
$timesheet->setDuration(3600);
$timesheet->setRate(293.27);
$timesheet->setUser($user1);
$timesheet->setActivity($activity1);
$timesheet->setProject((new Project())->setName('bar'));
$timesheet2 = new Timesheet();
$timesheet2
->setBegin(new \DateTime('2018-11-18'))
->setEnd(new \DateTime())
->setDuration(400)
->setRate(84.75)
->setUser($user1)
->setActivity($activity2)
->setProject((new Project())->setName('bar'));
$timesheet2->setBegin(new \DateTime('2018-11-18'));
$timesheet2->setEnd(new \DateTime());
$timesheet2->setDuration(400);
$timesheet2->setRate(84.75);
$timesheet2->setUser($user1);
$timesheet2->setActivity($activity2);
$timesheet2->setProject((new Project())->setName('bar'));
$timesheet3 = new Timesheet();
$timesheet3
->setBegin(clone $date)
->setEnd(new \DateTime())
->setDuration(1800)
->setRate(111.11)
->setUser($user1)
->setActivity($activity1)
->setProject((new Project())->setName('bar'));
$timesheet3->setBegin(clone $date);
$timesheet3->setEnd(new \DateTime());
$timesheet3->setDuration(1800);
$timesheet3->setRate(111.11);
$timesheet3->setUser($user1);
$timesheet3->setActivity($activity1);
$timesheet3->setProject((new Project())->setName('bar'));
$timesheet4 = new Timesheet();
$timesheet4
->setBegin(new \DateTime('2018-11-29'))
->setEnd(new \DateTime())
->setDuration(400)
->setRate(1947.99)
->setUser($user1)
->setActivity($activity2)
->setProject((new Project())->setName('bar'));
$timesheet4->setBegin(new \DateTime('2018-11-29'));
$timesheet4->setEnd(new \DateTime());
$timesheet4->setDuration(400);
$timesheet4->setRate(1947.99);
$timesheet4->setUser($user1);
$timesheet4->setActivity($activity2);
$timesheet4->setProject((new Project())->setName('bar'));
$timesheet5 = new Timesheet();
$timesheet5
->setBegin(new \DateTime('2018-11-18'))
->setEnd(new \DateTime())
->setDuration(400)
->setRate(84)
->setUser($user2)
->setActivity($activity3)
->setProject((new Project())->setName('bar'));
$timesheet5->setBegin(new \DateTime('2018-11-18'));
$timesheet5->setEnd(new \DateTime());
$timesheet5->setDuration(400);
$timesheet5->setRate(84);
$timesheet5->setUser($user2);
$timesheet5->setActivity($activity3);
$timesheet5->setProject((new Project())->setName('bar'));
$timesheet5a = new Timesheet();
$timesheet5a
->setBegin(new \DateTime('2018-11-08'))
->setEnd(new \DateTime())
->setDuration(400)
->setRate(84)
->setUser($user1)
->setActivity($activity3)
->setProject((new Project())->setName('bar'));
$timesheet5a->setBegin(new \DateTime('2018-11-08'));
$timesheet5a->setEnd(new \DateTime());
$timesheet5a->setDuration(400);
$timesheet5a->setRate(84);
$timesheet5a->setUser($user1);
$timesheet5a->setActivity($activity3);
$timesheet5a->setProject((new Project())->setName('bar'));
$timesheet6 = new Timesheet();
$timesheet6
->setBegin(clone $date)
->setEnd(new \DateTime())
->setDuration(0)
->setRate(0)
->setUser($user1)
->setProject((new Project())->setName('bar'));
$timesheet6->setBegin(clone $date);
$timesheet6->setEnd(new \DateTime());
$timesheet6->setDuration(0);
$timesheet6->setRate(0);
$timesheet6->setUser($user1);
$timesheet6->setProject((new Project())->setName('bar'));
$timesheet7 = new Timesheet();
$timesheet7
->setBegin(clone $date)
->setEnd(new \DateTime())
->setDuration(0)
->setRate(0)
->setUser($user2)
->setActivity(new Activity())
->setProject((new Project())->setName('bar'));
$timesheet7->setBegin(clone $date);
$timesheet7->setEnd(new \DateTime());
$timesheet7->setDuration(0);
$timesheet7->setRate(0);
$timesheet7->setUser($user2);
$timesheet7->setActivity(new Activity());
$timesheet7->setProject((new Project())->setName('bar'));
$timesheet8 = new Timesheet();
$timesheet8
->setBegin(clone $date)
->setEnd(new \DateTime())
->setDuration(0)
->setRate(0)
->setUser($user2)
->setProject((new Project())->setName('bar'));
$timesheet8->setBegin(clone $date);
$timesheet8->setEnd(new \DateTime());
$timesheet8->setDuration(0);
$timesheet8->setRate(0);
$timesheet8->setUser($user2);
$timesheet8->setProject((new Project())->setName('bar'));
$entries = [$timesheet, $timesheet2, $timesheet3, $timesheet4, $timesheet5, $timesheet5a, $timesheet6, $timesheet7, $timesheet8];