Add constructor property promotion and change service definitions to …

…xml for behat services

src/Controller/Action/Admin/ImportDataAction.php

@@ -26,38 +26,14 @@
 
 final class ImportDataAction
 {
-    /** @var ImportProcessorInterface */
-    private $importProcessor;
-
-    /** @var FormFactoryInterface */
-    private $formFactory;
-
-    /** @var RequestStack */
-    private $requestStack;
-
-    /** @var FormErrorsFlashHelperInterface */
-    private $formErrorsFlashHelper;
-
-    /** @var TranslatorInterface */
-    private $translator;
-
-    /** @var Environment */
-    private $twig;
-
     public function __construct(
-        ImportProcessorInterface $importProcessor,
-        FormFactoryInterface $formFactory,
-        RequestStack $requestStack,
-        FormErrorsFlashHelperInterface $formErrorsFlashHelper,
-        TranslatorInterface $translator,
-        Environment $twig,
+        private ImportProcessorInterface $importProcessor,
+        private FormFactoryInterface $formFactory,
+        private RequestStack $requestStack,
+        private FormErrorsFlashHelperInterface $formErrorsFlashHelper,
+        private TranslatorInterface $translator,
+        private Environment $twig,
     ) {
-        $this->importProcessor = $importProcessor;
-        $this->formFactory = $formFactory;
-        $this->requestStack = $requestStack;
-        $this->formErrorsFlashHelper = $formErrorsFlashHelper;
-        $this->translator = $translator;
-        $this->twig = $twig;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Action/Admin/ProductSearchAction.php

@@ -19,23 +19,11 @@
 
 final class ProductSearchAction
 {
-    /** @var ProductRepositoryInterface */
-    private $productRepository;
-
-    /** @var LocaleContextInterface */
-    private $localeContext;
-
-    /** @var ViewHandler */
-    private $viewHandler;
-
     public function __construct(
-        ProductRepositoryInterface $productRepository,
-        LocaleContextInterface $localeContext,
-        ViewHandler $viewHandler,
+        private ProductRepositoryInterface $productRepository,
+        private LocaleContextInterface $localeContext,
+        private ViewHandler $viewHandler,
     ) {
-        $this->productRepository = $productRepository;
-        $this->localeContext = $localeContext;
-        $this->viewHandler = $viewHandler;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Action/Admin/TaxonSearchAction.php

@@ -19,23 +19,11 @@
 
 final class TaxonSearchAction
 {
-    /** @var TaxonRepositoryInterface */
-    private $taxonRepository;
-
-    /** @var LocaleContextInterface */
-    private $localeContext;
-
-    /** @var ViewHandler */
-    private $viewHandler;
-
     public function __construct(
-        TaxonRepositoryInterface $taxonRepository,
-        LocaleContextInterface $localeContext,
-        ViewHandler $viewHandler,
+        private TaxonRepositoryInterface $taxonRepository,
+        private LocaleContextInterface $localeContext,
+        private ViewHandler $viewHandler,
     ) {
-        $this->taxonRepository = $taxonRepository;
-        $this->localeContext = $localeContext;
-        $this->viewHandler = $viewHandler;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Action/Admin/UploadEditorImageAction.php

@@ -23,23 +23,11 @@
 
 final class UploadEditorImageAction
 {
-    /** @var MediaProviderResolverInterface */
-    private $mediaProviderResolver;
-
-    /** @var MediaRepositoryInterface */
-    private $mediaRepository;
-
-    /** @var FactoryInterface */
-    private $mediaFactory;
-
     public function __construct(
-        MediaProviderResolverInterface $mediaProviderResolver,
-        MediaRepositoryInterface $mediaRepository,
-        FactoryInterface $mediaFactory,
+        private MediaProviderResolverInterface $mediaProviderResolver,
+        private MediaRepositoryInterface $mediaRepository,
+        private FactoryInterface $mediaFactory,
     ) {
-        $this->mediaProviderResolver = $mediaProviderResolver;
-        $this->mediaRepository = $mediaRepository;
-        $this->mediaFactory = $mediaFactory;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Helper/FormErrorsFlashHelper.php

@@ -17,16 +17,10 @@
 
 final class FormErrorsFlashHelper implements FormErrorsFlashHelperInterface
 {
-    /** @var RequestStack */
-    private $requestStack;
-
-    /** @var TranslatorInterface */
-    private $translator;
-
-    public function __construct(RequestStack $requestStack, TranslatorInterface $translator)
-    {
-        $this->requestStack = $requestStack;
-        $this->translator = $translator;
+    public function __construct(
+        private RequestStack $requestStack,
+        private TranslatorInterface $translator
+    ) {
     }
 
     public function addFlashErrors(FormInterface $form): void

src/Controller/PageSlugController.php

@@ -17,12 +17,8 @@
 
 final class PageSlugController
 {
-    /** @var SlugGeneratorInterface */
-    private $slugGenerator;
-
-    public function __construct(SlugGeneratorInterface $slugGenerator)
+    public function __construct(private SlugGeneratorInterface $slugGenerator)
     {
-        $this->slugGenerator = $slugGenerator;
     }
 
     public function generateAction(Request $request): JsonResponse

src/EventListener/ResourceDeleteSubscriber.php

@@ -23,8 +23,10 @@
 
 final class ResourceDeleteSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private UrlGeneratorInterface $router, private RequestStack $requestStack)
-    {
+    public function __construct(
+        private UrlGeneratorInterface $router,
+        private RequestStack $requestStack
+    ) {
     }
 
     public static function getSubscribedEvents(): array

src/Form/Type/WysiwygType.php

@@ -17,12 +17,8 @@
 
 final class WysiwygType extends AbstractType
 {
-    /** @var UrlGeneratorInterface */
-    private $urlGenerator;
-
-    public function __construct(UrlGeneratorInterface $urlGenerator)
+    public function __construct(private UrlGeneratorInterface $urlGenerator)
     {
-        $this->urlGenerator = $urlGenerator;
     }
 
     public function configureOptions(OptionsResolver $resolver): void

tests/Behat/Context/Api/BlockContext.php

@@ -18,16 +18,10 @@
 
 final class BlockContext implements Context
 {
-    private ApiClientInterface $apiClient;
-
-    private ResponseCheckerInterface $responseChecker;
-
     public function __construct(
-        ApiClientInterface $apiClient,
-        ResponseCheckerInterface $responseChecker,
+        private ApiClientInterface $apiClient,
+        private ResponseCheckerInterface $responseChecker
     ) {
-        $this->apiClient = $apiClient;
-        $this->responseChecker = $responseChecker;
     }
 
     /**

tests/Behat/Context/Api/FrequentlyAskedQuestionContext.php

@@ -19,16 +19,10 @@
 
 final class FrequentlyAskedQuestionContext implements Context
 {
-    private ApiClientInterface $apiClient;
-
-    private ResponseCheckerInterface $responseChecker;
-
     public function __construct(
-        ApiClientInterface $apiClient,
-        ResponseCheckerInterface $responseChecker,
+        private ApiClientInterface $apiClient,
+        private ResponseCheckerInterface $responseChecker,
     ) {
-        $this->apiClient = $apiClient;
-        $this->responseChecker = $responseChecker;
     }
 
     /**

tests/Behat/Context/Api/MediaContext.php

@@ -19,16 +19,10 @@
 
 final class MediaContext implements Context
 {
-    private ApiClientInterface $apiClient;
-
-    private ResponseCheckerInterface $responseChecker;
-
     public function __construct(
-        ApiClientInterface $apiClient,
-        ResponseCheckerInterface $responseChecker,
+        private ApiClientInterface $apiClient,
+        private ResponseCheckerInterface $responseChecker,
     ) {
-        $this->apiClient = $apiClient;
-        $this->responseChecker = $responseChecker;
     }
 
     /**

tests/Behat/Context/Api/PageContext.php

@@ -20,16 +20,10 @@
 
 final class PageContext implements Context
 {
-    private ApiClientInterface $apiClient;
-
-    private ResponseCheckerInterface $responseChecker;
-
     public function __construct(
-        ApiClientInterface $apiClient,
-        ResponseCheckerInterface $responseChecker,
+        private ApiClientInterface $apiClient,
+        private ResponseCheckerInterface $responseChecker,
     ) {
-        $this->apiClient = $apiClient;
-        $this->responseChecker = $responseChecker;
     }
 
     /**

tests/Behat/Context/Api/SectionContext.php

@@ -19,16 +19,10 @@
 
 final class SectionContext implements Context
 {
-    private ApiClientInterface $apiClient;
-
-    private ResponseCheckerInterface $responseChecker;
-
     public function __construct(
-        ApiClientInterface $apiClient,
-        ResponseCheckerInterface $responseChecker,
+        private ApiClientInterface $apiClient,
+        private ResponseCheckerInterface $responseChecker,
     ) {
-        $this->apiClient = $apiClient;
-        $this->responseChecker = $responseChecker;
     }
 
     /**

tests/Behat/Context/Setup/BlockContext.php

@@ -20,28 +20,12 @@
 
 final class BlockContext implements Context
 {
-    /** @var SharedStorageInterface */
-    private $sharedStorage;
-
-    /** @var RandomStringGeneratorInterface */
-    private $randomStringGenerator;
-
-    /** @var FactoryInterface */
-    private $blockFactory;
-
-    /** @var BlockRepositoryInterface */
-    private $blockRepository;
-
     public function __construct(
-        SharedStorageInterface $sharedStorage,
-        RandomStringGeneratorInterface $randomStringGenerator,
-        FactoryInterface $blockFactory,
-        BlockRepositoryInterface $blockRepository,
+        private SharedStorageInterface $sharedStorage,
+        private RandomStringGeneratorInterface $randomStringGenerator,
+        private FactoryInterface $blockFactory,
+        private BlockRepositoryInterface $blockRepository,
     ) {
-        $this->sharedStorage = $sharedStorage;
-        $this->randomStringGenerator = $randomStringGenerator;
-        $this->blockFactory = $blockFactory;
-        $this->blockRepository = $blockRepository;
     }
 
     /**

tests/Behat/Context/Setup/FrequentlyAskedQuestionContext.php

@@ -20,30 +20,14 @@
 
 final class FrequentlyAskedQuestionContext implements Context
 {
-    /** @var SharedStorageInterface */
-    private $sharedStorage;
-
-    /** @var RandomStringGeneratorInterface */
-    private $randomStringGenerator;
-
-    /** @var FactoryInterface */
-    private $frequentlyAskedQuestionFactory;
-
     public function __construct(
-        SharedStorageInterface $sharedStorage,
-        RandomStringGeneratorInterface $randomStringGenerator,
-        FactoryInterface $frequentlyAskedQuestionFactory,
-        FrequentlyAskedQuestionRepositoryInterface $frequentlyAskedQuestionRepository,
+        private SharedStorageInterface $sharedStorage,
+        private RandomStringGeneratorInterface $randomStringGenerator,
+        private FactoryInterface $frequentlyAskedQuestionFactory,
+        private FrequentlyAskedQuestionRepositoryInterface $frequentlyAskedQuestionRepository,
     ) {
-        $this->sharedStorage = $sharedStorage;
-        $this->randomStringGenerator = $randomStringGenerator;
-        $this->frequentlyAskedQuestionFactory = $frequentlyAskedQuestionFactory;
-        $this->frequentlyAskedQuestionRepository = $frequentlyAskedQuestionRepository;
     }
 
-    /** @var FrequentlyAskedQuestionRepositoryInterface */
-    private $frequentlyAskedQuestionRepository;
-
     /**
      * @Given the store has a frequently asked question
      */