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

Release 2.22.0 (#5043)

Browse Source
This commit is contained in:
Kevin Papst
2024-09-20 14:30:11 +02:00
committed by GitHub
parent 3e0dadc0c8
commit 537c120ad9
57 changed files with 435 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Form/Extension/DocumentationLinkExtension.php
View File

@@ -25,19 +25,11 @@ final class DocumentationLinkExtension extends AbstractTypeExtension
return [FormType::class];
}
/**
* @param FormView $view
* @param FormInterface $form
* @param array $options
*/
public function buildView(FormView $view, FormInterface $form, array $options): void
{
$view->vars['docu_chapter'] = $options['docu_chapter'] ?? null;
}
/**
* @param OptionsResolver $resolver
*/
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefined(['docu_chapter']);

7
src/Form/Extension/EnhancedChoiceTypeExtension.php
View File

@@ -26,11 +26,6 @@ final class EnhancedChoiceTypeExtension extends AbstractTypeExtension
return [EntityType::class, ChoiceType::class];
}
/**
* @param FormView $view
* @param FormInterface $form
* @param array $options
*/
public function buildView(FormView $view, FormInterface $form, array $options): void
{
if (isset($options['selectpicker']) && false === $options['selectpicker']) {
@@ -59,7 +54,7 @@ final class EnhancedChoiceTypeExtension extends AbstractTypeExtension
// there is a very weird logic in vendor/symfony/twig-bridge/Resources/views/Form/form_div_layout.html.twig
// in block "block choice_widget_collapsed" that resets "{% set required = false %}", so we fake it into the select
if (true === $options['required'] && (!\array_key_exists('size', $options['attr']) || $options['attr']['size'] <= 1)) {
if (true === $options['required'] && \is_array($options['attr']) && (!\array_key_exists('size', $options['attr']) || $options['attr']['size'] <= 1)) {
$extendedOptions['required'] = 'required';
$extendedOptions['placeholder'] = '';
}

5
src/Form/Extension/IconExtension.php
View File

@@ -25,11 +25,6 @@ final class IconExtension extends AbstractTypeExtension
return [TextType::class];
}
/**
* @param FormView $view
* @param FormInterface $form
* @param array $options
*/
public function buildView(FormView $view, FormInterface $form, array $options): void
{
$view->vars['icon'] = $options['icon'] ?? null;

9
src/Form/Extension/SelectWithApiDataExtension.php
View File

@@ -21,7 +21,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
*/
final class SelectWithApiDataExtension extends AbstractTypeExtension
{
public function __construct(private UrlGeneratorInterface $router)
public function __construct(private readonly UrlGeneratorInterface $router)
{
}
@@ -30,11 +30,6 @@ final class SelectWithApiDataExtension extends AbstractTypeExtension
return [EntityType::class];
}
/**
* @param FormView $view
* @param FormInterface $form
* @param array $options
*/
public function buildView(FormView $view, FormInterface $form, array $options): void
{
if (!isset($options['api_data'])) {
@@ -69,7 +64,7 @@ final class SelectWithApiDataExtension extends AbstractTypeExtension
$parent = $form->getParent();
do {
$formPrefixes[] = $parent->getName();
} while (($parent = $parent->getParent()) !== null);
} while (($parent = $parent?->getParent()) !== null);
$formPrefix = implode('_', array_reverse($formPrefixes));
$formField = $apiData['select'];

2
src/Form/Type/MenuChoiceType.php
View File

@@ -45,7 +45,7 @@ final class MenuChoiceType extends AbstractType
$this->eventDispatcher->dispatch($event);
$choices = $this->getChoicesFromMenu($event->getMenu(), $filter);
$choices += $this->getChoicesFromMenu($event->getAppsMenu(), $filter);
$choices += $this->getChoicesFromMenu($event->getAppsMenu(), $filter); // @phpstan-ignore-line
$choices += $this->getChoicesFromMenu($event->getAdminMenu(), $filter);
$choices += $this->getChoicesFromMenu($event->getSystemMenu(), $filter);