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

src/Reporting/ProjectDateRange/ProjectDateRangeForm.php

@@ -17,26 +17,12 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class ProjectDateRangeForm extends AbstractType
+final class ProjectDateRangeForm extends AbstractType
 {
-    /**
-     * Simplify cross linking between pages by removing the block prefix.
-     *
-     * @return null|string
-     */
-    public function getBlockPrefix()
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->add('customer', CustomerType::class, [
             'required' => false,
-            'label' => false,
             'width' => false,
         ]);
 
@@ -48,26 +34,24 @@ class ProjectDateRangeForm extends AbstractType
 
         $builder->add('includeNoWork', CheckboxType::class, [
             'required' => false,
-            'label' => 'label.includeNoWork',
+            'label' => 'includeNoWork',
         ]);
 
         $builder->add('budgetType', ChoiceType::class, [
-            'required' => true,
+            'placeholder' => null,
+            'required' => false,
             'multiple' => false,
             'expanded' => true,
             'choices' => [
-                'label.budgetIndependent' => null,
-                'label.includeNoBudget' => 'none',
-                'label.includeBudgetType_full' => 'full',
-                'label.includeBudgetType_month' => 'month',
+                'all' => null,
+                'includeNoBudget' => 'none',
+                'includeBudgetType_full' => 'full',
+                'includeBudgetType_month' => 'month',
             ],
         ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => ProjectDateRangeQuery::class,

src/Reporting/ProjectDateRange/ProjectDateRangeQuery.php

@@ -14,26 +14,11 @@ use App\Entity\User;
 
 final class ProjectDateRangeQuery
 {
-    /**
-     * @var \DateTime
-     */
-    private $month;
-    /**
-     * @var User|null
-     */
-    private $user;
-    /**
-     * @var Customer|null
-     */
-    private $customer;
-    /**
-     * @var bool
-     */
-    private $includeNoWork = false;
-    /**
-     * @var string|null
-     */
-    private $budgetType = null;
+    private \DateTime $month;
+    private ?User $user;
+    private ?Customer $customer = null;
+    private bool $includeNoWork = false;
+    private ?string $budgetType = null;
 
     public function __construct(\DateTime $month, User $user)
     {