BounceManager

tatevikg1 · tatevikg1 · commit 62a080d430d3 · 2025-10-21T12:00:36.000+04:00
diff --git a/src/Bounce/Service/ConsecutiveBounceHandler.php b/src/Bounce/Service/ConsecutiveBounceHandler.php
@@ -4,10 +4,10 @@
 
 namespace PhpList\Core\Bounce\Service;
 
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Model\UserMessage;
 use PhpList\Core\Domain\Messaging\Model\UserMessageBounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
diff --git a/src/Bounce/Service/Handler/BlacklistEmailAndDeleteBounceHandler.php b/src/Bounce/Service/Handler/BlacklistEmailAndDeleteBounceHandler.php
@@ -4,8 +4,8 @@
 
 namespace PhpList\Core\Bounce\Service\Handler;
 
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
diff --git a/src/Bounce/Service/Handler/BlacklistUserAndDeleteBounceHandler.php b/src/Bounce/Service/Handler/BlacklistUserAndDeleteBounceHandler.php
@@ -4,8 +4,8 @@
 
 namespace PhpList\Core\Bounce\Service\Handler;
 
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
diff --git a/src/Bounce/Service/Handler/DecreaseCountConfirmUserAndDeleteBounceHandler.php b/src/Bounce/Service/Handler/DecreaseCountConfirmUserAndDeleteBounceHandler.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Bounce\Service\Handler;
 
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
diff --git a/src/Bounce/Service/Handler/DeleteBounceHandler.php b/src/Bounce/Service/Handler/DeleteBounceHandler.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Bounce\Service\Handler;
 
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 
 class DeleteBounceHandler implements BounceActionHandlerInterface
 {
diff --git a/src/Bounce/Service/Handler/DeleteUserAndBounceHandler.php b/src/Bounce/Service/Handler/DeleteUserAndBounceHandler.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Bounce\Service\Handler;
 
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
 
 class DeleteUserAndBounceHandler implements BounceActionHandlerInterface
diff --git a/src/Bounce/Service/Handler/UnconfirmUserAndDeleteBounceHandler.php b/src/Bounce/Service/Handler/UnconfirmUserAndDeleteBounceHandler.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Bounce\Service\Handler;
 
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use Symfony\Contracts\Translation\TranslatorInterface;
diff --git a/src/Bounce/Service/Manager/BounceManager.php b/src/Bounce/Service/Manager/BounceManager.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Messaging\Service\Manager;
+namespace PhpList\Core\Bounce\Service\Manager;
 
 use DateTime;
 use DateTimeImmutable;
diff --git a/src/Bounce/Service/NativeBounceProcessingService.php b/src/Bounce/Service/NativeBounceProcessingService.php
@@ -7,9 +7,9 @@
 use Doctrine\ORM\EntityManagerInterface;
 use IMAP\Connection;
 use PhpList\Core\Bounce\Exception\OpenMboxFileException;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\Processor\BounceDataProcessor;
 use PhpList\Core\Domain\Common\Mail\NativeImapMailReader;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
diff --git a/src/Bounce/Service/Processor/AdvancedBounceRulesProcessor.php b/src/Bounce/Service/Processor/AdvancedBounceRulesProcessor.php
@@ -5,8 +5,8 @@
 namespace PhpList\Core\Bounce\Service\Processor;
 
 use PhpList\Core\Bounce\Service\BounceActionResolver;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Service\Manager\BounceRuleManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
diff --git a/src/Bounce/Service/Processor/BounceDataProcessor.php b/src/Bounce/Service/Processor/BounceDataProcessor.php
@@ -6,10 +6,10 @@
 
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Model\BounceStatus;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
diff --git a/src/Bounce/Service/Processor/UnidentifiedBounceReprocessor.php b/src/Bounce/Service/Processor/UnidentifiedBounceReprocessor.php
@@ -5,9 +5,9 @@
 namespace PhpList\Core\Bounce\Service\Processor;
 
 use DateTimeImmutable;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\MessageParser;
 use PhpList\Core\Domain\Messaging\Model\BounceStatus;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
diff --git a/src/Bounce/Service/WebklexBounceProcessingService.php b/src/Bounce/Service/WebklexBounceProcessingService.php
@@ -7,8 +7,8 @@
 use DateTimeImmutable;
 use DateTimeInterface;
 use PhpList\Core\Bounce\Exception\ImapConnectionException;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\Processor\BounceDataProcessor;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use Psr\Log\LoggerInterface;
 use Throwable;
 use Webklex\PHPIMAP\Client;
diff --git a/src/Domain/Subscription/Service/Manager/SubscriberManager.php b/src/Domain/Subscription/Service/Manager/SubscriberManager.php
@@ -84,7 +84,6 @@ public function updateSubscriber(UpdateSubscriberDto $subscriberDto, Administrat
     public function resetBounceCount(Subscriber $subscriber): Subscriber
     {
         $subscriber->setBounceCount(0);
-        $this->entityManager->flush();
 
         return $subscriber;
     }
diff --git a/tests/Unit/Bounce/Service/ConsecutiveBounceHandlerTest.php b/tests/Unit/Bounce/Service/ConsecutiveBounceHandlerTest.php
@@ -5,9 +5,9 @@
 namespace PhpList\Core\Tests\Unit\Bounce\Service;
 
 use PhpList\Core\Bounce\Service\ConsecutiveBounceHandler;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
diff --git a/tests/Unit/Bounce/Service/Handler/BlacklistEmailAndDeleteBounceHandlerTest.php b/tests/Unit/Bounce/Service/Handler/BlacklistEmailAndDeleteBounceHandlerTest.php
@@ -5,9 +5,9 @@
 namespace PhpList\Core\Tests\Unit\Bounce\Service\Handler;
 
 use PhpList\Core\Bounce\Service\Handler\BlacklistEmailAndDeleteBounceHandler;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/Unit/Bounce/Service/Handler/BlacklistUserAndDeleteBounceHandlerTest.php b/tests/Unit/Bounce/Service/Handler/BlacklistUserAndDeleteBounceHandlerTest.php
@@ -5,9 +5,9 @@
 namespace PhpList\Core\Tests\Unit\Bounce\Service\Handler;
 
 use PhpList\Core\Bounce\Service\Handler\BlacklistUserAndDeleteBounceHandler;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/Unit/Bounce/Service/Handler/DecreaseCountConfirmUserAndDeleteBounceHandlerTest.php b/tests/Unit/Bounce/Service/Handler/DecreaseCountConfirmUserAndDeleteBounceHandlerTest.php
@@ -5,8 +5,8 @@
 namespace PhpList\Core\Tests\Unit\Bounce\Service\Handler;
 
 use PhpList\Core\Bounce\Service\Handler\DecreaseCountConfirmUserAndDeleteBounceHandler;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
diff --git a/tests/Unit/Bounce/Service/Handler/DeleteBounceHandlerTest.php b/tests/Unit/Bounce/Service/Handler/DeleteBounceHandlerTest.php
@@ -5,8 +5,8 @@
 namespace PhpList\Core\Tests\Unit\Bounce\Service\Handler;
 
 use PhpList\Core\Bounce\Service\Handler\DeleteBounceHandler;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Bounce/Service/Handler/DeleteUserAndBounceHandlerTest.php b/tests/Unit/Bounce/Service/Handler/DeleteUserAndBounceHandlerTest.php
@@ -5,8 +5,8 @@
 namespace PhpList\Core\Tests\Unit\Bounce\Service\Handler;
 
 use PhpList\Core\Bounce\Service\Handler\DeleteUserAndBounceHandler;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
 use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/Unit/Bounce/Service/Handler/UnconfirmUserAndDeleteBounceHandlerTest.php b/tests/Unit/Bounce/Service/Handler/UnconfirmUserAndDeleteBounceHandlerTest.php
@@ -5,8 +5,8 @@
 namespace PhpList\Core\Tests\Unit\Bounce\Service\Handler;
 
 use PhpList\Core\Bounce\Service\Handler\UnconfirmUserAndDeleteBounceHandler;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
diff --git a/tests/Unit/Domain/Messaging/Service/Manager/BounceManagerTest.php b/tests/Unit/Domain/Messaging/Service/Manager/BounceManagerTest.php
@@ -6,11 +6,11 @@
 
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Model\UserMessageBounce;
 use PhpList\Core\Domain\Messaging\Repository\BounceRepository;
 use PhpList\Core\Domain\Messaging\Repository\UserMessageBounceRepository;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Processor/AdvancedBounceRulesProcessorTest.php b/tests/Unit/Processor/AdvancedBounceRulesProcessorTest.php
@@ -5,11 +5,11 @@
 namespace PhpList\Core\Tests\Unit\Processor;
 
 use PhpList\Core\Bounce\Service\BounceActionResolver;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\Processor\AdvancedBounceRulesProcessor;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Model\BounceRegex;
 use PhpList\Core\Domain\Messaging\Model\UserMessageBounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Messaging\Service\Manager\BounceRuleManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
diff --git a/tests/Unit/Processor/BounceDataProcessorTest.php b/tests/Unit/Processor/BounceDataProcessorTest.php
@@ -6,10 +6,10 @@
 
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\Processor\BounceDataProcessor;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
diff --git a/tests/Unit/Processor/UnidentifiedBounceReprocessorTest.php b/tests/Unit/Processor/UnidentifiedBounceReprocessorTest.php
@@ -5,11 +5,11 @@
 namespace PhpList\Core\Tests\Unit\Processor;
 
 use DateTimeImmutable;
+use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\MessageParser;
 use PhpList\Core\Bounce\Service\Processor\BounceDataProcessor;
 use PhpList\Core\Bounce\Service\Processor\UnidentifiedBounceReprocessor;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Style\SymfonyStyle;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace PhpList\Core\Bounce\Service\Handler;`
`6`	`6`
`7`		`-use PhpList\Core\Domain\Messaging\Service\Manager\BounceManager;`
	`7`	`+use PhpList\Core\Bounce\Service\Manager\BounceManager;`
`8`	`8`
`9`	`9`	`class DeleteBounceHandler implements BounceActionHandlerInterface`
`10`	`10`	`{`