Symfony 6 support & lock sylius min version to 1.14

Author: Julien

composer.json

@@ -29,9 +29,9 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
-        "sylius/sylius": "~1.8.0 || ~1.9.0 || ~1.10.0 || ~1.11.0 || ~1.12.0 || ~1.13.0 || ~1.14.0"
+        "sylius/sylius": "~1.14.0"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
@@ -45,7 +45,6 @@
         "friends-of-behat/suite-settings-extension": "^1.0",
         "friends-of-behat/symfony-extension": "^2.1",
         "friends-of-behat/variadic-extension": "^1.3",
-        "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
         "lakion/mink-debug-extension": "^2.0.0",
         "phpspec/phpspec": "^7.0",
         "phpstan/extension-installer": "^1.0",
@@ -55,13 +54,12 @@
         "phpstan/phpstan-webmozart-assert": "0.12.12",
         "phpunit/phpunit": "^9.5",
         "sensiolabs/security-checker": "^6.0",
-        "sylius-labs/coding-standard": "^3.1",
-        "symfony/browser-kit": "^4.4 || ^5.2 || ^5.4 || ^6.0",
-        "symfony/debug-bundle": "^4.4 || ^5.2 || ^5.4 || ^6.0",
-        "symfony/dotenv": "^4.4 || ^5.2 || ^5.4 || ^6.0",
-        "symfony/intl": "^4.4 || ^5.2 || ^5.4 || ^6.0",
-        "symfony/web-profiler-bundle": "^4.4 || ^5.2 || ^5.4 || ^6.0",
-        "vimeo/psalm": "4.4.1"
+        "sylius-labs/coding-standard": "*",
+        "symfony/browser-kit": "^6.0",
+        "symfony/debug-bundle": "^6.0",
+        "symfony/dotenv": "^6.0",
+        "symfony/intl": "^6.0",
+        "symfony/web-profiler-bundle": "^6.0"
     },
     "config": {
         "sort-packages": true,

src/Controller/Admin/UpdateColissimoParameterAction.php

@@ -10,38 +10,23 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
 
 final class UpdateColissimoParameterAction implements ActionInterface
 {
-    private EntityManagerInterface $manager;
-    private Environment $templatingEngine;
-    private ColissimoParameterRepositoryInterface $colissimoParameterRepository;
-    private FormFactoryInterface $formFactory;
-    private EventDispatcherInterface $dispatcher;
-    private FlashBagInterface $flashBag;
-    private TranslatorInterface $translator;
-
     public function __construct(
-        Environment $templatingEngine,
-        EntityManagerInterface $manager,
-        ColissimoParameterRepositoryInterface $colissimoParameterRepository,
-        FormFactoryInterface $formFactory,
-        EventDispatcherInterface $dispatcher,
-        FlashBagInterface $flashBag,
-        TranslatorInterface $translator
+        private EntityManagerInterface $manager,
+        private Environment $templatingEngine,
+        private ColissimoParameterRepositoryInterface $colissimoParameterRepository,
+        private FormFactoryInterface $formFactory,
+        private EventDispatcherInterface $dispatcher,
+        private RequestStack $requestStack,
+        private TranslatorInterface $translator,
     ) {
-        $this->templatingEngine = $templatingEngine;
-        $this->manager = $manager;
-        $this->colissimoParameterRepository = $colissimoParameterRepository;
-        $this->formFactory = $formFactory;
-        $this->dispatcher = $dispatcher;
-        $this->flashBag = $flashBag;
-        $this->translator = $translator;
     }
 
     public function __invoke(Request $request): Response
@@ -60,7 +45,7 @@ public function __invoke(Request $request): Response
         if ($form->isSubmitted() && $form->isValid()) {
             $this->dispatcher->dispatch(new ColissimoParameterCredentialsHasherEvent($colissimoParameter));
 
-            $this->flashBag->add(
+            $this->requestStack->getMainRequest()->getSession()->getFlashBag()->add(
                 'success',
                 $this->translator->trans('clever_age.admin.ui.colissimo_parameter.success'),
             );

src/Controller/Shop/PickupPointSearchByIdAction.php

@@ -11,12 +11,9 @@
 
 final class PickupPointSearchByIdAction implements ActionInterface
 {
-    private SearchPickupPointService $searchPickupPointService;
-
     public function __construct(
-        SearchPickupPointService $searchPickupPointService
+        private SearchPickupPointService $searchPickupPointService
     ) {
-        $this->searchPickupPointService = $searchPickupPointService;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Shop/PickupPointsSearchByCartAddressAction.php

@@ -13,15 +13,10 @@
 
 final class PickupPointsSearchByCartAddressAction implements ActionInterface
 {
-    private CartContextInterface $cartContext;
-    private SearchPickupPointService $searchPickupPointService;
-
     public function __construct(
-        CartContextInterface $cartContext,
-        SearchPickupPointService $searchPickupPointService
+        private CartContextInterface $cartContext,
+        private SearchPickupPointService $searchPickupPointService,
     ) {
-        $this->cartContext = $cartContext;
-        $this->searchPickupPointService = $searchPickupPointService;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Shop/RemovePickupPointIdToOrderAction.php

@@ -13,15 +13,10 @@
 
 final class RemovePickupPointIdToOrderAction implements ActionInterface
 {
-    private CartContextInterface $cartContext;
-    private EntityManagerInterface $entityManager;
-
     public function __construct(
-        CartContextInterface $cartContext,
-        EntityManagerInterface $entityManager
+        private CartContextInterface $cartContext,
+        private EntityManagerInterface $entityManager
     ) {
-        $this->cartContext = $cartContext;
-        $this->entityManager = $entityManager;
     }
 
     public function __invoke(Request $request): Response

src/Controller/Shop/SetPickupPointIdToOrderAction.php

@@ -16,18 +16,12 @@
 
 final class SetPickupPointIdToOrderAction implements ActionInterface
 {
-    private CartContextInterface $cartContext;
-    private EntityManagerInterface $entityManager;
-    private PickupPointByIdService $pickupPointByIdService;
 
     public function __construct(
-        CartContextInterface $cartContext,
-        EntityManagerInterface $entityManager,
-        PickupPointByIdService $pickupPointByIdService
+        private CartContextInterface $cartContext,
+        private EntityManagerInterface $entityManager,
+        private PickupPointByIdService $pickupPointByIdService
     ) {
-        $this->cartContext = $cartContext;
-        $this->entityManager = $entityManager;
-        $this->pickupPointByIdService = $pickupPointByIdService;
     }
 
     public function __invoke(Request $request): Response

src/EventSubscriber/ColissimoParameterCredentialsHasherSubscriber.php

@@ -11,18 +11,11 @@
 
 final class ColissimoParameterCredentialsHasherSubscriber implements EventSubscriberInterface
 {
-    private string $encryptionKey;
-    private HasherInterface $hasher;
-    private EntityManagerInterface $entityManager;
-
     public function __construct(
-        string $encryptionKey,
-        HasherInterface $hasher,
-        EntityManagerInterface $entityManager
+        private string $encryptionKey,
+        private HasherInterface $hasher,
+        private EntityManagerInterface $entityManager
     ) {
-        $this->encryptionKey = $encryptionKey;
-        $this->hasher = $hasher;
-        $this->entityManager = $entityManager;
     }
 
     public static function getSubscribedEvents(): array

src/Form/Type/ColissimoParameterType.php

@@ -15,13 +15,11 @@
 
 final class ColissimoParameterType extends AbstractType
 {
-    private string $encryptionKey;
-    private HasherInterface $hasher;
-
-    public function __construct(string $encryptionKey, HasherInterface $hasher)
+    public function __construct(
+        private string $encryptionKey,
+        private HasherInterface $hasher
+    )
     {
-        $this->encryptionKey = $encryptionKey;
-        $this->hasher = $hasher;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void

src/Service/AbstractService.php

@@ -11,27 +11,14 @@
 
 abstract class AbstractService
 {
-    protected ClientFactory $colissimoClient;
-    protected ColissimoParamsValidator $validator;
-    protected SlsResponseParser $slsResponseParser;
-    protected ColissimoParameterRepositoryInterface $colissimoParameterRepository;
-    protected HasherInterface $hasher;
-    protected string $encryptionKey;
-
     public function __construct(
-        ClientFactory $colissimoClient,
-        ColissimoParamsValidator $validator,
-        SlsResponseParser $slsResponseParser,
-        ColissimoParameterRepositoryInterface $colissimoParameterRepository,
-        HasherInterface $hasher,
-        string $encryptionKey
+        protected ClientFactory $colissimoClient,
+        protected ColissimoParamsValidator $validator,
+        protected SlsResponseParser $slsResponseParser,
+        protected ColissimoParameterRepositoryInterface $colissimoParameterRepository,
+        protected HasherInterface $hasher,
+        protected string $encryptionKey
     ) {
-        $this->colissimoClient = $colissimoClient;
-        $this->validator = $validator;
-        $this->slsResponseParser = $slsResponseParser;
-        $this->colissimoParameterRepository = $colissimoParameterRepository;
-        $this->hasher = $hasher;
-        $this->encryptionKey = $encryptionKey;
     }
 
     protected function doCall(

src/Service/SearchPickupPointService.php

@@ -12,18 +12,11 @@
 
 final class SearchPickupPointService
 {
-    private PickupPointByIdService $pickupPointByIdService;
-    private PickupPointsService $pickupPointsService;
-    private CartContextInterface $cartContext;
-
     public function __construct(
-        PickupPointByIdService $pickupPointByIdService,
-        PickupPointsService $pickupPointsService,
-        CartContextInterface $cartContext
+        protected PickupPointByIdService $pickupPointByIdService,
+        protected PickupPointsService $pickupPointsService,
+        protected CartContextInterface $cartContext
     ) {
-        $this->pickupPointByIdService = $pickupPointByIdService;
-        $this->pickupPointsService = $pickupPointsService;
-        $this->cartContext = $cartContext;
     }
 
     public function byId(string $pickupPointId, ?OrderInterface $order = null): ?PickupPoint

src/Twig/PickupPointsExtension.php

@@ -13,18 +13,11 @@
 
 final class PickupPointsExtension extends AbstractExtension
 {
-    private CartContextInterface $cartContext;
-    private SearchPickupPointService $searchPickupPointService;
-    private TranslatorInterface $translator;
-
     public function __construct(
-        CartContextInterface $cartContext,
-        SearchPickupPointService $searchPickupPointService,
-        TranslatorInterface $translator
+        private CartContextInterface $cartContext,
+        private SearchPickupPointService $searchPickupPointService,
+        private TranslatorInterface $translator
     ) {
-        $this->cartContext = $cartContext;
-        $this->searchPickupPointService = $searchPickupPointService;
-        $this->translator = $translator;
     }
 
     public function getFunctions(): array