Updated parameters.

src/Controller/CalculationController.php

@@ -192,11 +192,11 @@ public function pdf(): PdfResponse
      * Export a single calculation to a PDF document.
      */
     #[Get(path: '/pdf/{id}', name: 'pdf_id', requirements: self::ID_REQUIREMENT)]
-    public function pdfOne(Calculation $calculation, LoggerInterface $logger): PdfResponse
+    public function pdfOne(Calculation $calculation): PdfResponse
     {
         $minMargin = $this->getMinMargin();
         $qrcode = $this->getQrCode($calculation);
-        $doc = new CalculationReport($this, $calculation, $minMargin, $qrcode, $logger);
+        $doc = new CalculationReport($this, $calculation, $minMargin, $qrcode);
 
         return $this->renderPdfDocument($doc);
     }

src/Form/Parameters/AbstractParameterType.php

@@ -20,6 +20,9 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * Abstract type for a parameter.
+ */
 abstract class AbstractParameterType extends AbstractHelperType
 {
     public function configureOptions(OptionsResolver $resolver): void
@@ -44,11 +47,10 @@ public function finishView(FormView $view, FormInterface $form, array $options):
             }
 
             $child = $children[$key];
-            $attributes = \array_merge(
+            $child->vars['attr'] = \array_merge(
                 $child->vars['attr'] ?? [],
-                ['data-default' => $this->convertValue($key, $value)]
+                ['data-default' => $this->convertValue($value)]
             );
-            $child->vars['attr'] = $attributes;
         }
     }
 
@@ -65,7 +67,7 @@ protected function addCheckboxType(
     ): void {
         $helper->field($field)
             ->label($label)
-            ->labelClass('checkbox-inline checkbox-switch')
+            ->labelClass('checkbox-inline')
             ->help($help)
             ->addCheckboxType();
     }
@@ -75,18 +77,13 @@ protected function addCheckboxType(
      */
     abstract protected function getParameterClass(): string;
 
-    private function convertValue(string $key, mixed $value): mixed
+    private function convertValue(mixed $value): mixed
     {
         if ($value instanceof \BackedEnum) {
             return $value->value;
         }
         if (\is_bool($value)) {
-            return $value ? 1 : 0;
-        }
-
-        // special case for minimum margin
-        if ('minMargin' === $key && \is_numeric($value)) {
-            return (float) $value * 100.0;
+            return (int) $value;
         }
 
         return $value;
@@ -98,13 +95,9 @@ private function convertValue(string $key, mixed $value): mixed
     private function getDefaultValues(FormInterface $form): array
     {
         $config = $form->getRoot()->getConfig();
-        if (!$config->hasOption(AbstractHelperParametersType::DEFAULT_VALUES)) {
-            return [];
-        }
-
         $key = $this->getParameterClass()::getCacheKey();
         /** @psalm-var array<string, array<string, mixed>> $values */
-        $values = $config->getOption(AbstractHelperParametersType::DEFAULT_VALUES);
+        $values = $config->getOption(AbstractHelperParametersType::DEFAULT_VALUES, []);
 
         return $values[$key] ?? [];
     }

src/Form/User/UserRegistrationType.php

@@ -15,20 +15,25 @@
 
 use App\Entity\User;
 use App\Form\FormHelper;
-use App\Traits\TranslatorAwareTrait;
+use App\Service\ApplicationService;
+use App\Service\CaptchaImageService;
 use App\Utils\StringUtils;
 use Symfony\Component\Form\Event\PreSetDataEvent;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Service\ServiceMethodsSubscriberTrait;
-use Symfony\Contracts\Service\ServiceSubscriberInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Type to register a new user.
  */
-class UserRegistrationType extends AbstractUserCaptchaType implements ServiceSubscriberInterface
+class UserRegistrationType extends AbstractUserCaptchaType
 {
-    use ServiceMethodsSubscriberTrait;
-    use TranslatorAwareTrait;
+    public function __construct(
+        CaptchaImageService $service,
+        ApplicationService $application,
+        private readonly TranslatorInterface $translator,
+    ) {
+        parent::__construct($service, $application);
+    }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
@@ -49,7 +54,7 @@ protected function addFormFields(FormHelper $helper): void
             ->notMapped()
             ->rowClass('mb-0')
             ->label('registration.agreeTerms.label')
-            ->updateAttribute('data-error', $this->trans('registration.agreeTerms.error'))
+            ->updateAttribute('data-error', $this->translator->trans('registration.agreeTerms.error'))
             ->addCheckboxType(false);
         parent::addFormFields($helper);
 

src/Parameter/ApplicationParameters.php

@@ -102,7 +102,7 @@ public function getDefaultState(): ?CalculationState
     public function getDefaultValues(): array
     {
         // the customer and date parameters are omitted because default values are null
-        return $this->getParametersDefaultValues(
+        $values = $this->getParametersDefaultValues(
             DefaultParameter::class,
             DisplayParameter::class,
             HomePageParameter::class,
@@ -111,6 +111,14 @@ public function getDefaultValues(): array
             ProductParameter::class,
             SecurityParameter::class,
         );
+
+        // special case for minimum margin
+        $key = DefaultParameter::getCacheKey();
+        /** @psalm-var float $minMargin */
+        $minMargin = $values[$key]['minMargin'];
+        $values[$key]['minMargin'] = $minMargin * 100.0;
+
+        return $values;
     }
 
     /**

src/Report/CalculationReport.php

@@ -23,22 +23,19 @@
 use App\Report\Table\GroupsTable;
 use App\Report\Table\ItemsTable;
 use App\Report\Table\OverallTable;
-use App\Traits\LoggerTrait;
 use App\Utils\StringUtils;
 use Endroid\QrCode\Builder\Builder;
 use Endroid\QrCode\ErrorCorrectionLevel;
 use Endroid\QrCode\Writer\PngWriter;
 use fpdf\Enums\PdfMove;
 use fpdf\Enums\PdfTextAlignment;
 use fpdf\PdfBorder;
-use Psr\Log\LoggerInterface;
 
 /**
  * Report for a calculation.
  */
 class CalculationReport extends AbstractReport
 {
-    use LoggerTrait;
     use PdfMemoryImageTrait;
 
     private const QR_CODE_SIZE = 38.0;
@@ -47,8 +44,7 @@ public function __construct(
         AbstractController $controller,
         private readonly Calculation $calculation,
         private readonly float $minMargin,
-        private readonly string $qrcode,
-        private readonly LoggerInterface $logger
+        private readonly string $qrcode
     ) {
         parent::__construct($controller);
     }
@@ -61,11 +57,6 @@ public function getCalculation(): Calculation
         return $this->calculation;
     }
 
-    public function getLogger(): LoggerInterface
-    {
-        return $this->logger;
-    }
-
     /**
      * Gets the minimum allowed margin.
      */
@@ -124,8 +115,6 @@ private function checkEndHeight(Calculation $calculation): void
 
     /**
      * Gets the QR code image data.
-     *
-     * @throws \Exception
      */
     private function getQrCodeImageData(): ImageData
     {
@@ -209,14 +198,10 @@ private function renderQrCode(): void
             return;
         }
 
-        try {
-            $data = $this->getQrCodeImageData();
-            $x = $this->getPageWidth() - $this->getRightMargin() - self::QR_CODE_SIZE;
-            $y = $this->getPageHeight() - ReportFooter::FOOTER_OFFSET - self::QR_CODE_SIZE;
-            $this->imageData($data, $x, $y, self::QR_CODE_SIZE, self::QR_CODE_SIZE, $this->qrcode);
-        } catch (\Exception $e) {
-            $this->logException($e, $this->trans('report.calculation.error_qr_code'));
-        }
+        $data = $this->getQrCodeImageData();
+        $x = $this->getPageWidth() - $this->getRightMargin() - self::QR_CODE_SIZE;
+        $y = $this->getPageHeight() - ReportFooter::FOOTER_OFFSET - self::QR_CODE_SIZE;
+        $this->imageData($data, $x, $y, self::QR_CODE_SIZE, self::QR_CODE_SIZE, $this->qrcode);
     }
 
     private function renderTimestampable(Calculation $calculation): void

src/Service/CalculationUpdateService.php

@@ -38,6 +38,7 @@ class CalculationUpdateService implements ServiceSubscriberInterface
     use ServiceMethodsSubscriberTrait;
     use SessionAwareTrait;
     use TranslatorAwareTrait;
+
     private const KEY_DATE = 'calculation.update.date';
     private const KEY_INTERVAL = 'calculation.update.interval';
     private const KEY_STATES = 'calculation.update.states';

src/Traits/AuthorizationCheckerAwareTrait.php

@@ -35,11 +35,7 @@ trait AuthorizationCheckerAwareTrait
     #[SubscribedService]
     public function getChecker(): AuthorizationCheckerInterface
     {
-        if ($this->checker instanceof AuthorizationCheckerInterface) {
-            return $this->checker;
-        }
-
-        return $this->checker = $this->getContainerService(__FUNCTION__, AuthorizationCheckerInterface::class);
+        return $this->checker ??= $this->getContainerService(__FUNCTION__, AuthorizationCheckerInterface::class);
     }
 
     public function setChecker(AuthorizationCheckerInterface $checker): static

src/Traits/LoggerAwareTrait.php

@@ -31,11 +31,7 @@ trait LoggerAwareTrait
     #[SubscribedService]
     public function getLogger(): LoggerInterface
     {
-        if ($this->logger instanceof LoggerInterface) {
-            return $this->logger;
-        }
-
-        return $this->logger = $this->getContainerService(__FUNCTION__, LoggerInterface::class);
+        return $this->logger ??= $this->getContainerService(__FUNCTION__, LoggerInterface::class);
     }
 
     public function setLogger(LoggerInterface $logger): static

src/Traits/SessionAwareTrait.php

@@ -32,11 +32,7 @@ trait SessionAwareTrait
     #[SubscribedService]
     public function getRequestStack(): RequestStack
     {
-        if ($this->requestStack instanceof RequestStack) {
-            return $this->requestStack;
-        }
-
-        return $this->requestStack = $this->getContainerService(__FUNCTION__, RequestStack::class);
+        return $this->requestStack ??= $this->getContainerService(__FUNCTION__, RequestStack::class);
     }
 
     public function setRequestStack(RequestStack $requestStack): static

src/Traits/TranslatorAwareTrait.php

@@ -31,11 +31,7 @@ trait TranslatorAwareTrait
     #[SubscribedService]
     public function getTranslator(): TranslatorInterface
     {
-        if ($this->translator instanceof TranslatorInterface) {
-            return $this->translator;
-        }
-
-        return $this->translator = $this->getContainerService(__FUNCTION__, TranslatorInterface::class);
+        return $this->translator ??= $this->getContainerService(__FUNCTION__, TranslatorInterface::class);
     }
 
     public function setTranslator(TranslatorInterface $translator): static

tests/Form/Parameters/AbstractParameterTypeTest.php

@@ -26,7 +26,7 @@ public function testWithAllOptions(): void
         $values = [
             'action' => EntityAction::SHOW,
             'minMargin' => 1.1,
-            'text' => 'Fake text',
+            'name' => 'Fake text',
             'value' => true,
         ];
         $this->validateParameters($values);

tests/Form/User/UserRegistrationTypeTest.php

@@ -94,8 +94,7 @@ protected function getPreloadedExtensions(): array
             ->willReturn(false);
 
         $translator = $this->createMockTranslator();
-        $type = new UserRegistrationType($service, $application);
-        $type->setTranslator($translator);
+        $type = new UserRegistrationType($service, $application, $translator);
 
         return [
             $type,