jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Model/QuickEntryWeek.php
View File

@@ -18,12 +18,13 @@ use App\Entity\User;
*/
class QuickEntryWeek
{
private $startDate;
private $rows = [];
/**
* @var array<QuickEntryModel>
*/
private array $rows = [];
public function __construct(\DateTime $startDate)
public function __construct(private \DateTime $startDate)
{
$this->startDate = $startDate;
}
public function addRow(?User $user = null, ?Project $project = null, ?Activity $activity = null): QuickEntryModel
@@ -65,8 +66,8 @@ class QuickEntryWeek
private function sortByProjectName(QuickEntryModel $a, QuickEntryModel $b): int
{
$aName = $a->getProject() !== null ? $a->getProject()->getName() : null;
$bName = $b->getProject() !== null ? $b->getProject()->getName() : null;
$aName = $a->getProject()?->getName();
$bName = $b->getProject()?->getName();
if ($aName === null && $bName === null) {
$result = 0;
@@ -75,7 +76,7 @@ class QuickEntryWeek
} elseif ($aName !== null && $bName === null) {
$result = -1;
} else {
$result = strcmp($aName, $bName);
$result = strcmp((string) $aName, (string) $bName);
}
return $result < 0 ? -1 : 1;