From fcfd366dec5fbb6c506f82cbf5bc82b3419f80bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Sun, 12 Apr 2026 17:44:44 +0200 Subject: [PATCH] chore: flatten namespace --- src/Controller/Account/PersonalDataController.php | 4 ++-- src/Controller/Booking/Create/Step4Controller.php | 4 ++-- src/Controller/Newsletter/ConfirmController.php | 4 ++-- .../Newsletter => Model}/NewsletterConfirmationResult.php | 2 +- src/Service/{Newsletter => }/MailjetNewsletterService.php | 2 +- src/Service/{Newsletter => }/NewsletterDoubleOptInService.php | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-) rename src/{Service/Newsletter => Model}/NewsletterConfirmationResult.php (93%) rename src/Service/{Newsletter => }/MailjetNewsletterService.php (99%) rename src/Service/{Newsletter => }/NewsletterDoubleOptInService.php (98%) diff --git a/src/Controller/Account/PersonalDataController.php b/src/Controller/Account/PersonalDataController.php index 71134dc..8c4f7ff 100644 --- a/src/Controller/Account/PersonalDataController.php +++ b/src/Controller/Account/PersonalDataController.php @@ -15,8 +15,8 @@ use App\Repository\NewsletterOptInConfirmationRepository; use App\Security\Crypt; use App\Service\BookingEditDataLoaderService; use App\Service\ProfileCompletenessChecker; -use App\Service\Newsletter\MailjetNewsletterService; -use App\Service\Newsletter\NewsletterDoubleOptInService; +use App\Service\MailjetNewsletterService; +use App\Service\NewsletterDoubleOptInService; use Doctrine\ORM\EntityManagerInterface; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; diff --git a/src/Controller/Booking/Create/Step4Controller.php b/src/Controller/Booking/Create/Step4Controller.php index d3696a4..37694c2 100644 --- a/src/Controller/Booking/Create/Step4Controller.php +++ b/src/Controller/Booking/Create/Step4Controller.php @@ -18,8 +18,8 @@ use App\Service\BookingCreateContextFactory; use App\Service\BookingPriceCalculatorService; use App\Service\BookingService; use App\Service\BookingSessionService; -use App\Service\Newsletter\MailjetNewsletterService; -use App\Service\Newsletter\NewsletterDoubleOptInService; +use App\Service\MailjetNewsletterService; +use App\Service\NewsletterDoubleOptInService; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\FormInterface; diff --git a/src/Controller/Newsletter/ConfirmController.php b/src/Controller/Newsletter/ConfirmController.php index 3df85a9..ed1ab1b 100644 --- a/src/Controller/Newsletter/ConfirmController.php +++ b/src/Controller/Newsletter/ConfirmController.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace App\Controller\Newsletter; use App\Exception\NewsletterProviderException; -use App\Service\Newsletter\NewsletterConfirmationResult; -use App\Service\Newsletter\NewsletterDoubleOptInService; +use App\Model\NewsletterConfirmationResult; +use App\Service\NewsletterDoubleOptInService; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Service/Newsletter/NewsletterConfirmationResult.php b/src/Model/NewsletterConfirmationResult.php similarity index 93% rename from src/Service/Newsletter/NewsletterConfirmationResult.php rename to src/Model/NewsletterConfirmationResult.php index 2bea9ec..c2a2643 100644 --- a/src/Service/Newsletter/NewsletterConfirmationResult.php +++ b/src/Model/NewsletterConfirmationResult.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\Newsletter; +namespace App\Model; class NewsletterConfirmationResult { diff --git a/src/Service/Newsletter/MailjetNewsletterService.php b/src/Service/MailjetNewsletterService.php similarity index 99% rename from src/Service/Newsletter/MailjetNewsletterService.php rename to src/Service/MailjetNewsletterService.php index 6daa5d0..9ff4f7e 100644 --- a/src/Service/Newsletter/MailjetNewsletterService.php +++ b/src/Service/MailjetNewsletterService.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\Newsletter; +namespace App\Service; use App\Exception\NewsletterProviderException; use Psr\Log\LoggerInterface; diff --git a/src/Service/Newsletter/NewsletterDoubleOptInService.php b/src/Service/NewsletterDoubleOptInService.php similarity index 98% rename from src/Service/Newsletter/NewsletterDoubleOptInService.php rename to src/Service/NewsletterDoubleOptInService.php index ff2beac..d98c88a 100644 --- a/src/Service/Newsletter/NewsletterDoubleOptInService.php +++ b/src/Service/NewsletterDoubleOptInService.php @@ -2,11 +2,12 @@ declare(strict_types=1); -namespace App\Service\Newsletter; +namespace App\Service; use App\Email\Mailer; use App\Exception\NewsletterProviderException; use App\Entity\NewsletterOptInConfirmation; +use App\Model\NewsletterConfirmationResult; use App\Repository\NewsletterOptInConfirmationRepository; use Doctrine\ORM\EntityManagerInterface; use Psr\Log\LoggerInterface;