fixes

src/Controller/Action/CitySearchAction.php

@@ -15,20 +15,11 @@
 
 final class CitySearchAction
 {
-    private AddressRepositoryInterface $addressRepository;
-
-    private RepositoryInterface $countryRepository;
-
-    private ConfigurableViewHandlerInterface $viewHandler;
-
     public function __construct(
-        AddressRepositoryInterface $addressRepository,
-        RepositoryInterface $countryRepository,
-        ConfigurableViewHandlerInterface $viewHandler,
+        private AddressRepositoryInterface $addressRepository,
+        private RepositoryInterface $countryRepository,
+        private ConfigurableViewHandlerInterface $viewHandler,
     ) {
-        $this->addressRepository = $addressRepository;
-        $this->countryRepository = $countryRepository;
-        $this->viewHandler = $viewHandler;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Action/PostcodeSearchAction.php

@@ -15,20 +15,11 @@
 
 final class PostcodeSearchAction
 {
-    private AddressRepositoryInterface $addressRepository;
-
-    private RepositoryInterface $countryRepository;
-
-    private ConfigurableViewHandlerInterface $viewHandler;
-
     public function __construct(
-        AddressRepositoryInterface $addressRepository,
-        RepositoryInterface $countryRepository,
-        ConfigurableViewHandlerInterface $viewHandler,
+        private AddressRepositoryInterface $addressRepository,
+        private RepositoryInterface $countryRepository,
+        private ConfigurableViewHandlerInterface $viewHandler,
     ) {
-        $this->addressRepository = $addressRepository;
-        $this->countryRepository = $countryRepository;
-        $this->viewHandler = $viewHandler;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Action/ProductSearchAction.php

@@ -14,20 +14,11 @@
 
 final class ProductSearchAction
 {
-    private ProductRepositoryInterface $productRepository;
-
-    private LocaleContextInterface $localeContext;
-
-    private ConfigurableViewHandlerInterface $viewHandler;
-
     public function __construct(
-        ProductRepositoryInterface $productRepository,
-        LocaleContextInterface $localeContext,
-        ConfigurableViewHandlerInterface $viewHandler,
+        private ProductRepositoryInterface $productRepository,
+        private LocaleContextInterface $localeContext,
+        private ConfigurableViewHandlerInterface $viewHandler,
     ) {
-        $this->productRepository = $productRepository;
-        $this->localeContext = $localeContext;
-        $this->viewHandler = $viewHandler;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Action/ProvinceSearchAction.php

@@ -16,24 +16,12 @@
 
 final class ProvinceSearchAction
 {
-    private AddressRepositoryInterface $addressRepository;
-
-    private RepositoryInterface $provinceRepository;
-
-    private RepositoryInterface $countryRepository;
-
-    private ConfigurableViewHandlerInterface $viewHandler;
-
     public function __construct(
-        AddressRepositoryInterface $addressRepository,
-        RepositoryInterface $provinceRepository,
-        RepositoryInterface $countryRepository,
-        ConfigurableViewHandlerInterface $viewHandler,
+        private AddressRepositoryInterface $addressRepository,
+        private RepositoryInterface $provinceRepository,
+        private RepositoryInterface $countryRepository,
+        private ConfigurableViewHandlerInterface $viewHandler,
     ) {
-        $this->addressRepository = $addressRepository;
-        $this->provinceRepository = $provinceRepository;
-        $this->countryRepository = $countryRepository;
-        $this->viewHandler = $viewHandler;
     }
 
     public function __invoke(Request $request): Response

src/DataFetcher/BaseDataFetcher.php

@@ -8,11 +8,9 @@
 
 abstract class BaseDataFetcher implements DataFetcherInterface
 {
-    protected QueryFilterInterface $queryFilter;
-
-    public function __construct(QueryFilterInterface $queryFilter)
-    {
-        $this->queryFilter = $queryFilter;
+    public function __construct(
+        protected QueryFilterInterface $queryFilter,
+    ) {
     }
 
     /**

src/DataFetcher/DelegatingDataFetcher.php

@@ -9,14 +9,9 @@
 
 class DelegatingDataFetcher implements DelegatingDataFetcherInterface
 {
-    /**
-     * DataFetcher registry.
-     */
-    protected ServiceRegistryInterface $registry;
-
-    public function __construct(ServiceRegistryInterface $registry)
-    {
-        $this->registry = $registry;
+    public function __construct(
+        protected ServiceRegistryInterface $registry,
+    ) {
     }
 
     public function fetch(ReportInterface $report, array $configuration = []): Data

src/DataFetcher/NumberOfOrdersDataFetcher.php

@@ -11,15 +11,11 @@
 
 class NumberOfOrdersDataFetcher extends TimePeriodDataFetcher
 {
-    private string $orderClass;
-
     public function __construct(
+        private string $orderClass,
         QueryFilterInterface $queryFilter,
-        string $orderClass,
     ) {
         parent::__construct($queryFilter);
-
-        $this->orderClass = $orderClass;
     }
 
     protected function setupQueryFilter(array $configuration = []): void

src/DataFetcher/SalesTotalDataFetcher.php

@@ -11,15 +11,11 @@
 
 class SalesTotalDataFetcher extends TimePeriodDataFetcher
 {
-    private string $orderClass;
-
     public function __construct(
+        private string $orderClass,
         QueryFilterInterface $queryFilter,
-        string $orderClass,
     ) {
         parent::__construct($queryFilter);
-
-        $this->orderClass = $orderClass;
     }
 
     protected function setupQueryFilter(array $configuration = []): void

src/DataFetcher/UserRegistrationDataFetcher.php

@@ -9,15 +9,11 @@
 
 class UserRegistrationDataFetcher extends TimePeriodDataFetcher
 {
-    private string $userClass;
-
     public function __construct(
+        private string $userClass,
         QueryFilterInterface $queryFilter,
-        string $userClass,
     ) {
         parent::__construct($queryFilter);
-
-        $this->userClass = $userClass;
     }
 
     protected function setupQueryFilter(array $configuration = []): void

src/Filter/QueryFilter.php

@@ -14,17 +14,14 @@
 
 class QueryFilter implements QueryFilterInterface
 {
-    protected EntityManager $em;
-
     protected QueryBuilder $qb;
 
     protected array $joins = [];
 
-    public function __construct(EntityManager $entityManager)
-    {
-        $this->em = $entityManager;
-
-        $this->qb = $this->em->createQueryBuilder();
+    public function __construct(
+        protected EntityManager $em,
+    ) {
+        $this->qb = $em->createQueryBuilder();
     }
 
     public function getQueryBuilder(): QueryBuilder
@@ -48,7 +45,7 @@ protected function getGroupByParts(
         array $configuration = [],
         string $dateField = 'checkoutCompletedAt',
     ): array {
-        if (false === strpos($dateField, '.')) {
+        if (!str_contains($dateField, '.')) {
             $rootAlias = $qb->getRootAliases()[0];
             $dateF = $rootAlias . '.' . $dateField;
         } else {
@@ -62,10 +59,10 @@ protected function getGroupByParts(
                 $selectPeriod .= ', ';
                 $selectGroupBy .= ',';
             }
-            $salias = ucfirst(strtolower($groupByElement)) . 'Date';
-            $selectPeriod .= $groupByElement . '(' . $dateF . ') as ' . $salias;
+            $alias = ucfirst(strtolower($groupByElement)) . 'Date';
+            $selectPeriod .= $groupByElement . '(' . $dateF . ') as ' . $alias;
 
-            $selectGroupBy .= $salias;
+            $selectGroupBy .= $alias;
         }
 
         return [$selectPeriod, $selectGroupBy];
@@ -87,7 +84,7 @@ public function addTimePeriod(
         string $dateField = 'checkoutCompletedAt',
         ?string $rootAlias = null,
     ): void {
-        if (false === strpos($dateField, '.')) {
+        if (!str_contains($dateField, '.')) {
             if (null === $rootAlias) {
                 $rootAlias = $this->qb->getRootAliases()[0];
             }

src/Form/Builder/QueryFilterFormBuilder.php

@@ -20,28 +20,13 @@
 
 class QueryFilterFormBuilder implements QueryFilterFormBuilderInterface
 {
-    protected RepositoryInterface $addressRepository;
-
-    protected TaxonRepositoryInterface $taxonRepository;
-
-    protected ProductRepositoryInterface $productRepository;
-
-    protected ChannelRepositoryInterface $channelRepository;
-
-    protected UrlGeneratorInterface $generator;
-
     public function __construct(
-        RepositoryInterface $addressRepository,
-        TaxonRepositoryInterface $taxonRepository,
-        ProductRepositoryInterface $productRepository,
-        ChannelRepositoryInterface $channelRepository,
-        UrlGeneratorInterface $generator,
+        protected RepositoryInterface $addressRepository,
+        protected TaxonRepositoryInterface $taxonRepository,
+        protected ProductRepositoryInterface $productRepository,
+        protected ChannelRepositoryInterface $channelRepository,
+        protected UrlGeneratorInterface $generator,
     ) {
-        $this->addressRepository = $addressRepository;
-        $this->taxonRepository = $taxonRepository;
-        $this->productRepository = $productRepository;
-        $this->channelRepository = $channelRepository;
-        $this->generator = $generator;
     }
 
     public function addUserGender(FormBuilderInterface &$builder): void

src/Form/EventListener/BuildReportDataFetcherFormSubscriber.php

@@ -17,14 +17,10 @@
 
 class BuildReportDataFetcherFormSubscriber implements EventSubscriberInterface
 {
-    private ServiceRegistryInterface $dataFetcherRegistry;
-
-    private FormFactoryInterface $factory;
-
-    public function __construct(ServiceRegistryInterface $dataFetcherRegistry, FormFactoryInterface $factory)
-    {
-        $this->dataFetcherRegistry = $dataFetcherRegistry;
-        $this->factory = $factory;
+    public function __construct(
+        private ServiceRegistryInterface $dataFetcherRegistry,
+        private FormFactoryInterface $factory,
+    ) {
     }
 
     public static function getSubscribedEvents(): array

src/Form/EventListener/BuildReportRendererFormSubscriber.php

@@ -17,14 +17,10 @@
 
 class BuildReportRendererFormSubscriber implements EventSubscriberInterface
 {
-    private ServiceRegistryInterface $rendererRegistry;
-
-    private FormFactoryInterface $factory;
-
-    public function __construct(ServiceRegistryInterface $rendererRegistry, FormFactoryInterface $factory)
-    {
-        $this->rendererRegistry = $rendererRegistry;
-        $this->factory = $factory;
+    public function __construct(
+        private ServiceRegistryInterface $rendererRegistry,
+        private FormFactoryInterface $factory,
+    ) {
     }
 
     public static function getSubscribedEvents(): array

src/Form/Type/DataFetcher/BaseDataFetcherType.php

@@ -9,10 +9,8 @@
 
 abstract class BaseDataFetcherType extends AbstractType
 {
-    protected QueryFilterFormBuilderInterface $queryFilterFormBuilder;
-
-    public function __construct(QueryFilterFormBuilderInterface $queryFilterFormBuilder)
-    {
-        $this->queryFilterFormBuilder = $queryFilterFormBuilder;
+    public function __construct(
+        protected QueryFilterFormBuilderInterface $queryFilterFormBuilder,
+    ) {
     }
 }

src/Form/Type/DataFetcher/DataFetcherChoiceType.php

@@ -10,13 +10,9 @@
 
 class DataFetcherChoiceType extends AbstractType
 {
-    protected array $dataFetchers;
-
-    public function __construct(array $dataFetchers)
-    {
-        /**
-         * @phpstan-ignore-next-line
-         */
+    public function __construct(
+        protected array $dataFetchers,
+    ) {
         $this->dataFetchers = array_combine(array_values($dataFetchers), array_keys($dataFetchers));
     }
 

src/Form/Type/Renderer/RendererChoiceType.php

@@ -10,13 +10,9 @@
 
 class RendererChoiceType extends AbstractType
 {
-    protected array $renderers;
-
-    public function __construct(array $renderers)
-    {
-        /**
-         * @phpstan-ignore-next-line
-         */
+    public function __construct(
+        protected array $renderers,
+    ) {
         $this->renderers = array_combine(array_values($renderers), array_keys($renderers));
     }
 

src/Form/Type/ReportDataFetcherConfigurationType.php

@@ -11,18 +11,12 @@
 
 class ReportDataFetcherConfigurationType extends AbstractResourceType
 {
-    protected DelegatingDataFetcherInterface $delegatingDataFetcher;
-
-    protected string $dataFetcherConfigurationTemplate;
-
     public function __construct(
+        protected DelegatingDataFetcherInterface $delegatingDataFetcher,
         string $dataClass,
         array $validationGroups,
-        DelegatingDataFetcherInterface $delegatingDataFetcher,
     ) {
         parent::__construct($dataClass, $validationGroups);
-
-        $this->delegatingDataFetcher = $delegatingDataFetcher;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void