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

Release 2.0.18 (#4003)

Browse Source 
* prevent too long values for user preferences
* add chart value 0 to y-axis if last value > 0, to always display the zero line (project details)
* add user-preferences to invoice hydrator
* DateTime vs DateTimeInterface
* simplify permission config
* fix query for teamleads limiting to only selected teams not possible
This commit is contained in:
Kevin Papst
2023-05-08 17:11:55 +02:00
committed by GitHub
parent d8f72b8b88
commit 1099e76244
74 changed files with 627 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Controller/AbstractController.php
View File

@@ -20,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstract
use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormTypeInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -47,19 +48,41 @@ abstract class AbstractController extends BaseAbstractController implements Serv
return $this->container->get('translator');
}
protected function createSearchForm(string $type = FormType::class, $data = null, array $options = []): FormInterface
/**
* @template TFormType of FormTypeInterface<TData>
* @template TData of mixed
* @param class-string<TFormType> $type
* @param TData $data
* @param array<mixed> $options
* @return FormInterface<TData>
*/
protected function createSearchForm(string $type, mixed $data, array $options = []): FormInterface
{
return $this->createFormForGetRequest($type, $data, $options);
}
protected function createFormForGetRequest(string $type = FormType::class, $data = null, array $options = []): FormInterface
/**
* @template TFormType of FormTypeInterface<TData>
* @template TData of mixed
* @param class-string<TFormType> $type
* @param TData $data
* @param array<mixed> $options
* @return FormInterface<TData>
*/
protected function createFormForGetRequest(string $type, mixed $data, array $options = []): FormInterface
{
return $this->container
->get('form.factory')
->createNamed('', $type, $data, array_merge(['method' => 'GET'], $options));
return $this->container->get('form.factory')->createNamed('', $type, $data, array_merge(['method' => 'GET'], $options)); // @phpstan-ignore-line
}
protected function createFormWithName(string $name, string $type, mixed $data = null, array $options = []): FormInterface
/**
* @template TFormType of FormTypeInterface<TData>
* @template TData of mixed
* @param class-string<TFormType> $type
* @param TData|null $data
* @param array<mixed> $options
* @return FormInterface<TData|null>
*/
protected function createFormWithName(string $name, string $type = FormType::class, mixed $data = null, array $options = []): FormInterface
{
return $this->container->get('form.factory')->createNamed($name, $type, $data, $options);
}
@@ -166,6 +189,9 @@ abstract class AbstractController extends BaseAbstractController implements Serv
/**
* Handles exception flash messages for failed update/create actions.
* @param \Exception $exception
* @param FormInterface $form
* @return void
*/
protected function handleFormUpdateException(\Exception $exception, FormInterface $form): void
{