Fix code style and psalm errors

composer.json

@@ -39,7 +39,6 @@
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.17",
-        "psalm/plugin-symfony": "^3.1",
         "setono/code-quality-pack": "^2.2",
         "sylius/admin-api-bundle": "^1.11",
         "sylius/sylius": "~1.10.14",
@@ -75,12 +74,8 @@
         "sort-packages": true
     },
     "scripts": {
-        "analyse": [
-            "@ensure-test-container-exists",
-            "psalm"
-        ],
+        "analyse": "psalm",
         "check-style": "ecs check",
-        "ensure-test-container-exists": "[[ -f tests/Application/var/cache/test/Tests_Setono_SyliusAbandonedCartPlugin_Application_KernelTestDebugContainer.xml ]] || tests/Application/bin/console cache:warmup --env=test",
         "fix-style": "ecs check --fix",
         "phpunit": "phpunit"
     }

psalm.xml

@@ -15,13 +15,6 @@
         </ignoreFiles>
     </projectFiles>
     <plugins>
-        <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin">
-            <!-- Symfony 4 container XML -->
-            <containerXml>tests/Application/var/cache/test/ApplicationTests_Setono_SyliusAbandonedCartPlugin_Application_KernelTestDebugContainer.xml</containerXml>
-
-            <!-- Symfony 5 container XML -->
-            <containerXml>tests/Application/var/cache/test/Tests_Setono_SyliusAbandonedCartPlugin_Application_KernelTestDebugContainer.xml</containerXml>
-        </pluginClass>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>
     <issueHandlers>

src/Controller/Action/UnsubscribeCustomerAction.php

@@ -26,7 +26,7 @@ public function __construct(
         EmailHasherInterface $emailHasher,
         UnsubscribedCustomerRepositoryInterface $unsubscribedCustomerRepository,
         UnsubscribedCustomerFactoryInterface $unsubscribedCustomerFactory,
-        Environment $twig
+        Environment $twig,
     ) {
         $this->emailHasher = $emailHasher;
         $this->unsubscribedCustomerRepository = $unsubscribedCustomerRepository;
@@ -50,7 +50,7 @@ public function __invoke(Request $request): Response
 
             Assert::false(
                 $this->unsubscribedCustomerRepository->isUnsubscribed($email),
-                'setono_sylius_abandoned_cart.ui.email_already_unsubscribed'
+                'setono_sylius_abandoned_cart.ui.email_already_unsubscribed',
             );
 
             $this->unsubscribedCustomerRepository->add($this->unsubscribedCustomerFactory->createWithEmail($email));

src/DependencyInjection/Configuration.php

@@ -23,6 +23,7 @@ public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('setono_sylius_abandoned_cart');
 
+        /** @var ArrayNodeDefinition $rootNode */
         $rootNode = $treeBuilder->getRootNode();
 
         /** @psalm-suppress MixedMethodCall,PossiblyNullReference,PossiblyUndefinedMethod */

src/Dispatcher/NotificationDispatcher.php

@@ -39,7 +39,7 @@ public function __construct(
         MessageBusInterface $commandBus,
         NotificationRepositoryInterface $notificationRepository,
         Registry $workflowRegistry,
-        int $idleThresholdInMinutes
+        int $idleThresholdInMinutes,
     ) {
         $this->managerRegistry = $managerRegistry;
         $this->logger = new NullLogger();
@@ -52,12 +52,12 @@ public function __construct(
     public function dispatch(): void
     {
         $notifications = $this->notificationRepository->findNew(
-            new DateInterval(sprintf('PT%dM', $this->idleThresholdInMinutes))
+            new DateInterval(sprintf('PT%dM', $this->idleThresholdInMinutes)),
         );
 
         $this->logger->debug(sprintf(
             'Notifications with associated orders that have not been updated for %d minutes will be notified',
-            $this->idleThresholdInMinutes
+            $this->idleThresholdInMinutes,
         ));
 
         $dispatchCount = 0;
@@ -68,7 +68,7 @@ public function dispatch(): void
                 $this->logger->warning(sprintf(
                     'The notification with id %d could not take the transition "%s"',
                     (int) $notification->getId(),
-                    NotificationWorkflow::TRANSITION_START
+                    NotificationWorkflow::TRANSITION_START,
                 ));
 
                 continue;

src/EventListener/Doctrine/CreateNotificationOnOrderPersistenceListener.php

@@ -18,7 +18,7 @@ final class CreateNotificationOnOrderPersistenceListener
 
     public function __construct(
         NotificationFactoryInterface $notificationFactory,
-        ManagerRegistry $managerRegistry
+        ManagerRegistry $managerRegistry,
     ) {
         $this->notificationFactory = $notificationFactory;
         $this->managerRegistry = $managerRegistry;

src/EventSubscriber/Workflow/ResetProcessingErrorsSubscriber.php

@@ -17,7 +17,7 @@ public static function getSubscribedEvents(): array
         $event = sprintf(
             'workflow.%s.transition.%s',
             NotificationWorkflow::NAME,
-            NotificationWorkflow::TRANSITION_START
+            NotificationWorkflow::TRANSITION_START,
         );
 
         return [

src/Factory/OrderFactory.php

@@ -20,7 +20,7 @@ final class OrderFactory implements FactoryInterface
 
     public function __construct(
         FactoryInterface $decorated,
-        OrderTokenAssignerInterface $orderTokenAssigner
+        OrderTokenAssignerInterface $orderTokenAssigner,
     ) {
         $this->decorated = $decorated;
         $this->orderTokenAssigner = $orderTokenAssigner;

src/Mailer/EmailManager.php

@@ -21,7 +21,7 @@ final class EmailManager implements EmailManagerInterface
     public function __construct(
         SenderInterface $emailSender,
         CartRecoveryUrlGeneratorInterface $cartRecoveryUrlGenerator,
-        UnsubscribeUrlGeneratorInterface $unsubscribeUrlGenerator
+        UnsubscribeUrlGeneratorInterface $unsubscribeUrlGenerator,
     ) {
         $this->emailSender = $emailSender;
         $this->cartRecoveryUrlGenerator = $cartRecoveryUrlGenerator;

src/Message/Handler/ProcessNotificationHandler.php

@@ -21,7 +21,7 @@ final class ProcessNotificationHandler implements MessageHandlerInterface
 
     public function __construct(
         NotificationRepositoryInterface $notificationRepository,
-        NotificationProcessorInterface $notificationProcessor
+        NotificationProcessorInterface $notificationProcessor,
     ) {
         $this->notificationRepository = $notificationRepository;
         $this->notificationProcessor = $notificationProcessor;
@@ -36,7 +36,7 @@ public function __invoke(ProcessNotification $message): void
         if (null === $notification) {
             throw new UnrecoverableMessageHandlingException(sprintf(
                 'Could not find notification with id %d',
-                $message->notificationId
+                $message->notificationId,
             ));
         }
 

src/Processor/NotificationProcessor.php

@@ -32,7 +32,7 @@ public function __construct(
         ManagerRegistry $managerRegistry,
         EmailManagerInterface $emailManager,
         Registry $workflowRegistry,
-        NotificationEligibilityCheckerInterface $notificationEligibilityChecker
+        NotificationEligibilityCheckerInterface $notificationEligibilityChecker,
     ) {
         $this->managerRegistry = $managerRegistry;
         $this->emailManager = $emailManager;
@@ -62,7 +62,7 @@ function (NotificationInterface $notification) {
                     Assert::notNull($order);
 
                     $this->emailManager->sendNotification($notification);
-                }
+                },
             );
         } catch (Throwable $e) {
             $message = sprintf(
@@ -99,7 +99,7 @@ private function tryTransition(NotificationInterface $notification, string $tran
                 $notification->addProcessingError(sprintf(
                     'Could not take transition "%s". The state when trying to take the transition was: "%s"',
                     $transition,
-                    $notification->getState()
+                    $notification->getState(),
                 ));
 
                 $this->tryTransition($notification, NotificationWorkflow::TRANSITION_FAIL);

src/Pruner/Pruner.php

@@ -22,7 +22,7 @@ public function __construct(NotificationRepositoryInterface $notificationReposit
     public function prune(): void
     {
         $this->notificationRepository->removeOlderThan(
-            new DateTimeImmutable(sprintf('-%d minutes', $this->pruneOlderThan))
+            new DateTimeImmutable(sprintf('-%d minutes', $this->pruneOlderThan)),
         );
     }
 }

src/UrlGenerator/CartRecoveryUrlGenerator.php

@@ -23,7 +23,7 @@ public function __construct(UrlGeneratorInterface $urlGenerator, string $route)
 
     public function generate(
         OrderInterface $order,
-        array $parameters = []
+        array $parameters = [],
     ): string {
         $channel = $order->getChannel();
         Assert::notNull($channel);
@@ -48,7 +48,7 @@ public function generate(
             '%s://%s%s',
             $this->urlGenerator->getContext()->getScheme(),
             (string) $channel->getHostname(),
-            $path
+            $path,
         );
     }
 }

src/UrlGenerator/CartRecoveryUrlGeneratorInterface.php

@@ -13,6 +13,6 @@ interface CartRecoveryUrlGeneratorInterface
      */
     public function generate(
         OrderInterface $order,
-        array $parameters = []
+        array $parameters = [],
     ): string;
 }

src/UrlGenerator/UnsubscribeUrlGenerator.php

@@ -28,7 +28,7 @@ public function generate(
         ChannelInterface $channel,
         string $email,
         string $locale,
-        array $parameters = []
+        array $parameters = [],
     ): string {
         $parameters = array_merge([
             'email' => $email,
@@ -51,7 +51,7 @@ public function generate(
             '%s://%s%s',
             $this->urlGenerator->getContext()->getScheme(),
             (string) $channel->getHostname(),
-            $path
+            $path,
         );
     }
 }

src/UrlGenerator/UnsubscribeUrlGeneratorInterface.php

@@ -15,6 +15,6 @@ public function generate(
         ChannelInterface $channel,
         string $email,
         string $locale,
-        array $parameters = []
+        array $parameters = [],
     ): string;
 }

tests/Factory/OrderFactoryTest.php

@@ -30,7 +30,7 @@ public function it_creates_notification_when_creating_order(): void
 
         $factory = new OrderFactory(
             new Factory(Order::class),
-            $orderTokenAssigner->reveal()
+            $orderTokenAssigner->reveal(),
         );
         $factory->createNew();
     }

tests/UrlGenerator/UnsubscribeUrlGeneratorTest.php

@@ -30,15 +30,15 @@ public function it_generates_url(): void
         $urlGenerator = new UnsubscribeUrlGenerator(
             $this->urlGenerator,
             new EmailHasher('salt'),
-            'setono_sylius_abandoned_cart_shop_unsubscribe_customer'
+            'setono_sylius_abandoned_cart_shop_unsubscribe_customer',
         );
 
         $channel = new Channel();
         $channel->setHostname('example.com');
 
         self::assertSame(
             'https://example.com/abandoned-cart/[email protected]&hash=2ac21379842b5445001475a596caab5843ecbc6be46c27f882cb6c0bd75fb9f9&utm_source=sylius&utm_medium=email&utm_campaign=Abandoned%20Cart%20Unsubscribe&_locale=en_US',
-            $urlGenerator->generate($channel, '[email protected]', 'en_US')
+            $urlGenerator->generate($channel, '[email protected]', 'en_US'),
         );
     }
 
@@ -50,7 +50,7 @@ public function it_allows_to_overwrite_parameters(): void
         $urlGenerator = new UnsubscribeUrlGenerator(
             $this->urlGenerator,
             new EmailHasher('salt'),
-            'setono_sylius_abandoned_cart_shop_unsubscribe_customer'
+            'setono_sylius_abandoned_cart_shop_unsubscribe_customer',
         );
 
         $channel = new Channel();
@@ -61,7 +61,7 @@ public function it_allows_to_overwrite_parameters(): void
             $urlGenerator->generate($channel, '[email protected]', 'en_US', [
                 'utm_campaign' => 'Abandoned Cart Unsubscribe #2',
                 'utm_content' => 'Number two',
-            ])
+            ]),
         );
     }
 }