Update: Bump the bundle to Symfony 7 (interim step toward Symfony 8) (Case 212955)

composer.json

@@ -4,38 +4,38 @@
     "license": "MIT",
 
     "require": {
-        "php": ">=7.2",
+        "php": "^8.2",
         "ext-mbstring": "*",
         "doctrine/collections": "^1.6",
         "doctrine/orm": "^2.0",
-        "psr/log": "^1.1",
+        "psr/log": "^3.0",
         "ramsey/uuid": "^4.0",
-        "symfony/config": "^4.0 | ^5.0",
-        "symfony/console": "^4.0 | ^5.0",
-        "symfony/contracts": "^1.0 | ^2.0",
-        "symfony/dependency-injection": "^4.0 | ^5.0",
-        "symfony/doctrine-bridge": "^4.0 | ^5.0",
-        "symfony/form": "^4.0 | ^5.0",
-        "symfony/http-foundation": "^4.0 | ^5.0",
-        "symfony/http-kernel": "^2.0 | ^3.0 | ^4.0 | ^5.0",
-        "symfony/mailer": "^4.0 | ^5.0",
-        "symfony/mime": "^4.0 | ^5.0",
-        "symfony/options-resolver": "^4.0 | ^5.0",
-        "symfony/routing": "^4.0 | ^5.0",
-        "symfony/translation": "^4.0 | ^5.0",
-        "symfony/validator": "^4.0 | ^5.0",
-        "twig/twig": "^2.0 | ^3.0"
+        "symfony/config": "^7.0",
+        "symfony/console": "^7.0",
+        "symfony/contracts": "^3.0",
+        "symfony/dependency-injection": "^7.0",
+        "symfony/doctrine-bridge": "^7.0",
+        "symfony/form": "^7.0",
+        "symfony/http-foundation": "^7.0",
+        "symfony/http-kernel": "^7.0",
+        "symfony/mailer": "^7.0",
+        "symfony/mime": "^7.0",
+        "symfony/options-resolver": "^7.0",
+        "symfony/routing": "^7.0",
+        "symfony/translation": "^7.0",
+        "symfony/validator": "^7.0",
+        "twig/twig": "^3.0"
     },
 
     "require-dev": {
         "doctrine/common": "^2.0 | ^3.0",
         "doctrine/doctrine-bundle": "^2.4",
         "phpunit/phpunit": "^8.5.0",
-        "symfony/browser-kit": "^7.4",
-        "symfony/css-selector": "^7.4",
-        "symfony/framework-bundle": "^4.4 | ^5.0",
-        "symfony/twig-bundle": "^4.4|^5.0",
-        "symfony/yaml": "^6.4",
+        "symfony/browser-kit": "^7.0",
+        "symfony/css-selector": "^7.0",
+        "symfony/framework-bundle": "^7.0",
+        "symfony/twig-bundle": "^7.0",
+        "symfony/yaml": "^7.0",
         "zenstruck/foundry": "^1.0"
     },
 

src/ConfirmRegistration/Task.php

@@ -3,7 +3,8 @@
 namespace Webfactory\NewsletterRegistrationBundle\ConfirmRegistration;
 
 use DateTimeImmutable;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Webfactory\NewsletterRegistrationBundle\Entity\EmailAddressFactoryInterface;
 use Webfactory\NewsletterRegistrationBundle\Entity\PendingOptInInterface;
@@ -21,7 +22,7 @@ class Task implements TaskInterface
     protected EmailAddressFactoryInterface $emailAddressFactory;
     protected RecipientFactoryInterface $recipientFactory;
     protected RecipientRepositoryInterface $recipientRepo;
-    protected FlashBagInterface $flashBag;
+    protected RequestStack $requestStack;
     protected TranslatorInterface $translator;
 
     public function __construct(
@@ -30,15 +31,15 @@ public function __construct(
         EmailAddressFactoryInterface $emailAddressFactory,
         RecipientFactoryInterface $recipientFactory,
         RecipientRepositoryInterface $recipientRepo,
-        FlashBagInterface $flashBag,
+        RequestStack $requestStack,
         TranslatorInterface $translator
     ) {
         $this->pendingOptInRepo = $pendingOptInRepo;
         $this->timeLimitForOptInInHours = $timeLimitForOptInInHours;
         $this->emailAddressFactory = $emailAddressFactory;
         $this->recipientFactory = $recipientFactory;
         $this->recipientRepo = $recipientRepo;
-        $this->flashBag = $flashBag;
+        $this->requestStack = $requestStack;
         $this->translator = $translator;
     }
 
@@ -62,7 +63,9 @@ public function confirmRegistration(
         $this->recipientRepo->save($recipient);
         $this->pendingOptInRepo->remove($pendingOptIn);
 
-        $this->flashBag->add(
+        $session = $this->requestStack->getSession();
+        \assert($session instanceof FlashBagAwareSessionInterface);
+        $session->getFlashBag()->add(
             'success',
             $this->translator->trans('confirm.registration.complete', [], 'webfactory-newsletter-registration')
         );

src/Controller.php

@@ -8,7 +8,7 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Twig\Environment;
 use Webfactory\NewsletterRegistrationBundle\BlockEmails\TaskInterface as BlockEmailsTaskInterface;

src/DeleteOutdatedBlockedEmailAddresses/Command.php

@@ -16,8 +16,10 @@ public function __construct(TaskInterface $task)
         $this->task = $task;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->task->deleteOutdatedBlockedEmailAddresses();
+
+        return self::SUCCESS;
     }
 }

src/DeleteOutdatedPendingOptIns/Command.php

@@ -16,8 +16,10 @@ public function __construct(TaskInterface $task)
         $this->task = $task;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->task->deleteOutdatedPendingOptIns();
+
+        return self::SUCCESS;
     }
 }

src/DeleteRegistration/Task.php

@@ -2,32 +2,35 @@
 
 namespace Webfactory\NewsletterRegistrationBundle\DeleteRegistration;
 
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Webfactory\NewsletterRegistrationBundle\Entity\RecipientInterface;
 use Webfactory\NewsletterRegistrationBundle\Entity\RecipientRepositoryInterface;
 
 class Task implements TaskInterface
 {
     protected RecipientRepositoryInterface $recipientRepo;
-    protected FlashBagInterface $flashBag;
+    protected RequestStack $requestStack;
     protected TranslatorInterface $translator;
 
     public function __construct(
         RecipientRepositoryInterface $recipientRepo,
-        FlashBagInterface $flashBag,
+        RequestStack $requestStack,
         TranslatorInterface $translator
     ) {
         $this->recipientRepo = $recipientRepo;
-        $this->flashBag = $flashBag;
+        $this->requestStack = $requestStack;
         $this->translator = $translator;
     }
 
     public function deleteRegistration(RecipientInterface $recipient): void
     {
         $this->recipientRepo->remove($recipient);
 
-        $this->flashBag->add(
+        $session = $this->requestStack->getSession();
+        \assert($session instanceof FlashBagAwareSessionInterface);
+        $session->getFlashBag()->add(
             'success',
             $this->translator->trans('delete.registration.success', [], 'webfactory-newsletter-registration')
         );

src/DependencyInjection/services.yml

@@ -96,7 +96,7 @@ services:
             - '@Webfactory\NewsletterRegistrationBundle\Entity\EmailAddressFactoryInterface'
             - '@Webfactory\NewsletterRegistrationBundle\Entity\RecipientFactoryInterface'
             - '@Webfactory\NewsletterRegistrationBundle\Entity\RecipientRepositoryInterface'
-            - '@Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface'
+            - '@request_stack'
             - '@Symfony\Contracts\Translation\TranslatorInterface'
 
     Webfactory\NewsletterRegistrationBundle\ConfirmRegistration\TaskInterface:
@@ -110,7 +110,7 @@ services:
     Webfactory\NewsletterRegistrationBundle\EditRegistration\Task:
         arguments:
             - '@Webfactory\NewsletterRegistrationBundle\Entity\RecipientRepositoryInterface'
-            - '@Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface'
+            - '@request_stack'
             - '@Symfony\Contracts\Translation\TranslatorInterface'
 
     Webfactory\NewsletterRegistrationBundle\EditRegistration\TaskInterface:
@@ -119,7 +119,7 @@ services:
     Webfactory\NewsletterRegistrationBundle\DeleteRegistration\Task:
         arguments:
             - '@Webfactory\NewsletterRegistrationBundle\Entity\RecipientRepositoryInterface'
-            - '@Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface'
+            - '@request_stack'
             - '@Symfony\Contracts\Translation\TranslatorInterface'
 
     Webfactory\NewsletterRegistrationBundle\DeleteRegistration\TaskInterface:

src/EditRegistration/Task.php

@@ -2,24 +2,25 @@
 
 namespace Webfactory\NewsletterRegistrationBundle\EditRegistration;
 
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Webfactory\NewsletterRegistrationBundle\Entity\RecipientInterface;
 use Webfactory\NewsletterRegistrationBundle\Entity\RecipientRepositoryInterface;
 
 class Task implements TaskInterface
 {
     protected RecipientRepositoryInterface $recipientRepo;
-    protected FlashBagInterface $flashBag;
+    protected RequestStack $requestStack;
     protected TranslatorInterface $translator;
 
     public function __construct(
         RecipientRepositoryInterface $recipientRepo,
-        FlashBagInterface $flashBag,
+        RequestStack $requestStack,
         TranslatorInterface $translator
     ) {
         $this->recipientRepo = $recipientRepo;
-        $this->flashBag = $flashBag;
+        $this->requestStack = $requestStack;
         $this->translator = $translator;
     }
 
@@ -30,7 +31,9 @@ public function editRegistration(RecipientInterface $recipient): void
         $messageKey = \count($recipient->getNewsletters()) > 0
             ? 'edit.registration.updated'
             : 'edit.registration.updated.no.newsletters.chosen';
-        $this->flashBag->add(
+        $session = $this->requestStack->getSession();
+        \assert($session instanceof FlashBagAwareSessionInterface);
+        $session->getFlashBag()->add(
             'success',
             $this->translator->trans($messageKey, [], 'webfactory-newsletter-registration')
         );

src/StartRegistration/EmailAddressType.php

@@ -124,11 +124,7 @@ protected function createEmailAddressIsAllowedToReceiveOptInEmailsConstraint():
         };
     }
 
-    /**
-     * @param EmailAddress|null           $viewData
-     * @param FormInterface[]|Traversable $forms
-     */
-    public function mapDataToForms($viewData, $forms)
+    public function mapDataToForms(mixed $viewData, Traversable $forms): void
     {
         if (null === $viewData) {
             return;
@@ -144,7 +140,7 @@ public function mapDataToForms($viewData, $forms)
         $forms[static::ELEMENT_EMAIL_ADDRESS]->setData($viewData->getEmailAddress());
     }
 
-    public function mapFormsToData($forms, &$viewData)
+    public function mapFormsToData(Traversable $forms, mixed &$viewData): void
     {
         $forms = iterator_to_array($forms);
 

tests/ConfirmRegistration/TaskTest.php

@@ -5,7 +5,9 @@
 use DateTimeImmutable;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Webfactory\NewsletterRegistrationBundle\ConfirmRegistration\Task;
 use Webfactory\NewsletterRegistrationBundle\Entity\EmailAddressFactory;
@@ -25,6 +27,7 @@ class TaskTest extends TestCase
     protected RecipientFactoryInterface&MockObject $recipientFactory;
     protected RecipientRepositoryInterface&MockObject $recipientRepo;
     protected PendingOptInRepositoryInterface&MockObject $pendingOptInRepo;
+    protected RequestStack&MockObject $requestStack;
     protected FlashBagInterface&MockObject $flashBag;
     protected TranslatorInterface&MockObject $translator;
     protected Task $task;
@@ -38,14 +41,18 @@ protected function setUp(): void
         $this->recipientRepo = $this->createMock(RecipientRepositoryInterface::class);
         $this->pendingOptInRepo = $this->createMock(PendingOptInRepositoryInterface::class);
         $this->flashBag = $this->createMock(FlashBagInterface::class);
+        $session = $this->createMock(FlashBagAwareSessionInterface::class);
+        $session->method('getFlashBag')->willReturn($this->flashBag);
+        $this->requestStack = $this->createMock(RequestStack::class);
+        $this->requestStack->method('getSession')->willReturn($session);
         $this->translator = $this->createMock(TranslatorInterface::class);
         $this->task = new Task(
             $this->pendingOptInRepo,
             self::TIME_LIMIT_FOR_OPT_IN_IN_HOURS,
             $this->emailAddressFactory,
             $this->recipientFactory,
             $this->recipientRepo,
-            $this->flashBag,
+            $this->requestStack,
             $this->translator
         );
     }

tests/DeleteRegistration/TaskTest.php

@@ -4,7 +4,9 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Webfactory\NewsletterRegistrationBundle\DeleteRegistration\Task;
 use Webfactory\NewsletterRegistrationBundle\Entity\EmailAddress;
@@ -14,6 +16,7 @@
 class TaskTest extends TestCase
 {
     protected RecipientRepositoryInterface&MockObject $recipientRepo;
+    protected RequestStack&MockObject $requestStack;
     protected FlashBagInterface&MockObject $flashBag;
     protected Task $task;
     protected TranslatorInterface&MockObject $translator;
@@ -24,8 +27,12 @@ protected function setUp(): void
 
         $this->recipientRepo = $this->createMock(RecipientRepositoryInterface::class);
         $this->flashBag = $this->createMock(FlashBagInterface::class);
+        $session = $this->createMock(FlashBagAwareSessionInterface::class);
+        $session->method('getFlashBag')->willReturn($this->flashBag);
+        $this->requestStack = $this->createMock(RequestStack::class);
+        $this->requestStack->method('getSession')->willReturn($session);
         $this->translator = $this->createMock(TranslatorInterface::class);
-        $this->task = new Task($this->recipientRepo, $this->flashBag, $this->translator);
+        $this->task = new Task($this->recipientRepo, $this->requestStack, $this->translator);
     }
 
     /**

tests/EditRegistration/TaskTest.php

@@ -4,7 +4,9 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpFoundation\Session\FlashBagAwareSessionInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Webfactory\NewsletterRegistrationBundle\EditRegistration\Task;
 use Webfactory\NewsletterRegistrationBundle\Entity\EmailAddress;
@@ -14,6 +16,7 @@
 class TaskTest extends TestCase
 {
     protected RecipientRepositoryInterface&MockObject $recipientRepo;
+    protected RequestStack&MockObject $requestStack;
     protected FlashBagInterface&MockObject $flashBag;
     protected Task $task;
     protected TranslatorInterface&MockObject $translator;
@@ -24,8 +27,12 @@ protected function setUp(): void
 
         $this->recipientRepo = $this->createMock(RecipientRepositoryInterface::class);
         $this->flashBag = $this->createMock(FlashBagInterface::class);
+        $session = $this->createMock(FlashBagAwareSessionInterface::class);
+        $session->method('getFlashBag')->willReturn($this->flashBag);
+        $this->requestStack = $this->createMock(RequestStack::class);
+        $this->requestStack->method('getSession')->willReturn($session);
         $this->translator = $this->createMock(TranslatorInterface::class);
-        $this->task = new Task($this->recipientRepo, $this->flashBag, $this->translator);
+        $this->task = new Task($this->recipientRepo, $this->requestStack, $this->translator);
     }
 
     /**

tests/Fixtures/config/routes.php

@@ -3,5 +3,5 @@
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 return function (RoutingConfigurator $routes): void {
-    $routes->import(__DIR__.'/../../../src/Controller.php', 'annotation');
+    $routes->import(__DIR__.'/../../../src/Controller.php', 'attribute');
 };