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

6
src/Form/Helper/ActivityHelper.php
View File

@@ -19,12 +19,10 @@ final class ActivityHelper
public const PATTERN_SPACER = '{spacer}';
public const SPACER = ' - ';
private $configuration;
private $pattern;
private ?string $pattern = null;
public function __construct(SystemConfiguration $configuration)
public function __construct(private SystemConfiguration $configuration)
{
$this->configuration = $configuration;
}
public function getChoicePattern(): string

6
src/Form/Helper/CustomerHelper.php
View File

@@ -21,12 +21,10 @@ final class CustomerHelper
public const PATTERN_SPACER = '{spacer}';
public const SPACER = ' - ';
private $configuration;
private $pattern;
private ?string $pattern = null;
public function __construct(SystemConfiguration $configuration)
public function __construct(private SystemConfiguration $configuration)
{
$this->configuration = $configuration;
}
public function getChoicePattern(): string

60
src/Form/Helper/ProjectHelper.php
View File

@@ -9,9 +9,10 @@
namespace App\Form\Helper;
use App\Configuration\LocaleService;
use App\Configuration\SystemConfiguration;
use App\Entity\Project;
use App\Utils\LocaleSettings;
use Symfony\Contracts\Translation\TranslatorInterface;
final class ProjectHelper
{
@@ -25,15 +26,13 @@ final class ProjectHelper
public const PATTERN_SPACER = '{spacer}';
public const SPACER = ' - ';
private $configuration;
private $localeSettings;
private $dateFormat;
private $pattern;
private ?\IntlDateFormatter $dateFormatter = null;
private ?string $pattern = null;
private bool $showStart = false;
private bool $showEnd = false;
public function __construct(SystemConfiguration $configuration, LocaleSettings $localeSettings)
public function __construct(private SystemConfiguration $configuration, private LocaleService $localeService, private TranslatorInterface $translator)
{
$this->configuration = $configuration;
$this->localeSettings = $localeSettings;
}
public function getChoicePattern(): string
@@ -54,27 +53,40 @@ final class ProjectHelper
public function getChoiceLabel(Project $project): string
{
if ($this->dateFormat === null) {
$this->dateFormat = $this->localeSettings->getDateFormat();
}
$start = '?';
if ($project->getStart() !== null) {
$start = $project->getStart()->format($this->dateFormat);
}
$end = '?';
if ($project->getEnd() !== null) {
$end = $project->getEnd()->format($this->dateFormat);
}
$name = $this->getChoicePattern();
$name = str_replace(self::PATTERN_NAME, $project->getName(), $name);
$name = str_replace(self::PATTERN_COMMENT, $project->getComment() ?? '', $name);
$name = str_replace(self::PATTERN_CUSTOMER, $project->getCustomer()->getName() ?? '', $name);
$name = str_replace(self::PATTERN_ORDERNUMBER, $project->getOrderNumber() ?? '', $name);
$name = str_replace(self::PATTERN_START, $start, $name);
$name = str_replace(self::PATTERN_END, $end, $name);
if ($this->dateFormatter === null) {
$this->showStart = stripos($name, self::PATTERN_START) !== false;
$this->showEnd = stripos($name, self::PATTERN_END) !== false;
$this->dateFormatter = new \IntlDateFormatter(
\Locale::getDefault(),
\IntlDateFormatter::MEDIUM,
\IntlDateFormatter::MEDIUM,
date_default_timezone_get(),
\IntlDateFormatter::GREGORIAN,
$this->localeService->getDateFormat(\Locale::getDefault())
);
}
if ($this->showStart) {
$start = '';
if ($project->getStart() !== null) {
$start = $this->translator->trans('project_start') . ': ' . $this->dateFormatter->format($project->getStart()) . ' ';
}
$name = str_replace(self::PATTERN_START, $start, $name);
}
if ($this->showEnd) {
$end = '';
if ($project->getEnd() !== null) {
$end = ' ' . $this->translator->trans('project_end') . ': ' . $this->dateFormatter->format($project->getEnd());
}
$name = str_replace(self::PATTERN_END, $end, $name);
}
$name = ltrim($name, self::SPACER);
$name = rtrim($name, self::SPACER);

14
src/Form/Helper/ToolbarHelper.php
View File

@@ -15,18 +15,16 @@ use Symfony\Component\Form\FormBuilderInterface;
final class ToolbarHelper
{
private $userService;
private $teamService;
private $teamNames = ['team', 'teams', 'searchTeams'];
private $userNames = ['user', 'users'];
/** @var array<string> */
private array $teamNames = ['team', 'teams', 'searchTeams'];
/** @var array<string> */
private array $userNames = ['user', 'users'];
public function __construct(UserService $userService, TeamService $teamService)
public function __construct(private UserService $userService, private TeamService $teamService)
{
$this->userService = $userService;
$this->teamService = $teamService;
}
public function cleanupForm(FormBuilderInterface $builder)
public function cleanupForm(FormBuilderInterface $builder): void
{
$deleteUser = false;
foreach ($this->userNames as $name) {