Naming fix

tatevikg1 · tatevikg1 · commit 621e93de54b3 · 2025-07-24T12:52:08.000+04:00
diff --git a/config/services/managers.yml b/config/services/managers.yml
@@ -48,6 +48,10 @@ services:
     autowire: true
     autoconfigure: true
 
+  PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager:
+    autowire: true
+    autoconfigure: true
+
   PhpList\Core\Domain\Subscription\Service\Manager\SubscriberAttributeManager:
     autowire: true
     autoconfigure: true
diff --git a/src/Domain/Subscription/Model/Filter/SubscriberHistoryFilter.php b/src/Domain/Subscription/Model/Filter/SubscriberHistoryFilter.php
@@ -8,7 +8,7 @@
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 
-class SubscriptionHistoryFilter implements FilterRequestInterface
+class SubscriberHistoryFilter implements FilterRequestInterface
 {
     private ?Subscriber $subscriber;
     private ?string $ip;
diff --git a/src/Domain/Subscription/Repository/SubscriberHistoryRepository.php b/src/Domain/Subscription/Repository/SubscriberHistoryRepository.php
@@ -9,7 +9,7 @@
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
-use PhpList\Core\Domain\Subscription\Model\Filter\SubscriptionHistoryFilter;
+use PhpList\Core\Domain\Subscription\Model\Filter\SubscriberHistoryFilter;
 use PhpList\Core\Domain\Subscription\Model\SubscriberHistory;
 
 class SubscriberHistoryRepository extends AbstractRepository implements PaginatableRepositoryInterface
@@ -24,7 +24,7 @@ public function getFilteredAfterId(int $lastId, int $limit, ?FilterRequestInterf
     {
         $queryBuilder = $this->createQueryBuilder('sh');
 
-        if (!$filter instanceof SubscriptionHistoryFilter) {
+        if (!$filter instanceof SubscriberHistoryFilter) {
             throw new InvalidArgumentException('Expected SubscriptionHistoryFilter.');
         }
 
diff --git a/src/Domain/Subscription/Service/Manager/SubscriberHistoryManager.php b/src/Domain/Subscription/Service/Manager/SubscriberHistoryManager.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Subscription\Service;
+namespace PhpList\Core\Domain\Subscription\Service\Manager;
 
-use PhpList\Core\Domain\Subscription\Model\Filter\SubscriptionHistoryFilter;
+use PhpList\Core\Domain\Subscription\Model\Filter\SubscriberHistoryFilter;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberHistoryRepository;
 
-class SubscriptionHistoryService
+class SubscriberHistoryManager
 {
     private SubscriberHistoryRepository $repository;
 
@@ -16,7 +16,7 @@ public function __construct(SubscriberHistoryRepository $repository)
         $this->repository = $repository;
     }
 
-    public function getHistory(int $lastId, int $limit, SubscriptionHistoryFilter $filter): array
+    public function getHistory(int $lastId, int $limit, SubscriberHistoryFilter $filter): array
     {
         return $this->repository->getFilteredAfterId($lastId, $limit, $filter);
     }
diff --git a/tests/Unit/Domain/Subscription/Service/Manager/AttributeDefinitionManagerTest.php b/tests/Unit/Domain/Subscription/Service/Manager/AttributeDefinitionManagerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service;
+namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service\Manager;
 
 use PhpList\Core\Domain\Subscription\Exception\AttributeDefinitionCreationException;
 use PhpList\Core\Domain\Subscription\Model\Dto\AttributeDefinitionDto;
diff --git a/tests/Unit/Domain/Subscription/Service/Manager/SubscriberAttributeManagerTest.php b/tests/Unit/Domain/Subscription/Service/Manager/SubscriberAttributeManagerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service;
+namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service\Manager;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Domain\Subscription\Exception\SubscriberAttributeCreationException;
diff --git a/tests/Unit/Domain/Subscription/Service/Manager/SubscriberHistoryManagerTest.php b/tests/Unit/Domain/Subscription/Service/Manager/SubscriberHistoryManagerTest.php
@@ -2,24 +2,24 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service;
+namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service\Manager;
 
-use PhpList\Core\Domain\Subscription\Model\Filter\SubscriptionHistoryFilter;
+use PhpList\Core\Domain\Subscription\Model\Filter\SubscriberHistoryFilter;
 use PhpList\Core\Domain\Subscription\Model\SubscriberHistory;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberHistoryRepository;
-use PhpList\Core\Domain\Subscription\Service\SubscriptionHistoryService;
+use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-class SubscriptionHistoryServiceTest extends TestCase
+class SubscriberHistoryManagerTest extends TestCase
 {
     private SubscriberHistoryRepository|MockObject $subscriberHistoryRepository;
-    private SubscriptionHistoryService $subscriptionHistoryService;
+    private SubscriberHistoryManager $subscriptionHistoryService;
 
     protected function setUp(): void
     {
         $this->subscriberHistoryRepository = $this->createMock(SubscriberHistoryRepository::class);
-        $this->subscriptionHistoryService = new SubscriptionHistoryService(
+        $this->subscriptionHistoryService = new SubscriberHistoryManager(
             repository: $this->subscriberHistoryRepository
         );
     }
@@ -28,7 +28,7 @@ public function testGetHistoryCallsRepositoryWithCorrectParameters(): void
     {
         $lastId = 10;
         $limit = 20;
-        $filter = $this->createMock(SubscriptionHistoryFilter::class);
+        $filter = $this->createMock(SubscriberHistoryFilter::class);
         $expectedResult = [$this->createMock(SubscriberHistory::class)];
 
         $this->subscriberHistoryRepository
@@ -46,7 +46,7 @@ public function testGetHistoryReturnsEmptyArrayWhenRepositoryReturnsEmptyArray()
     {
         $lastId = 10;
         $limit = 20;
-        $filter = $this->createMock(SubscriptionHistoryFilter::class);
+        $filter = $this->createMock(SubscriberHistoryFilter::class);
         $expectedResult = [];
 
         $this->subscriberHistoryRepository
diff --git a/tests/Unit/Domain/Subscription/Service/Manager/SubscriberListManagerTest.php b/tests/Unit/Domain/Subscription/Service/Manager/SubscriberListManagerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service;
+namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service\Manager;
 
 use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Subscription\Model\Dto\CreateSubscriberListDto;
diff --git a/tests/Unit/Domain/Subscription/Service/Manager/SubscriberManagerTest.php b/tests/Unit/Domain/Subscription/Service/Manager/SubscriberManagerTest.php
@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service;
+namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service\Manager;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Domain\Messaging\Message\SubscriberConfirmationMessage;
 use PhpList\Core\Domain\Subscription\Model\Dto\CreateSubscriberDto;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
-use PHPUnit\Framework\MockObject\MockObject;
 use PhpList\Core\Domain\Subscription\Service\SubscriberDeletionService;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
diff --git a/tests/Unit/Domain/Subscription/Service/Manager/SubscriptionManagerTest.php b/tests/Unit/Domain/Subscription/Service/Manager/SubscriptionManagerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service;
+namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service\Manager;
 
 use PhpList\Core\Domain\Subscription\Exception\SubscriptionCreationException;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
diff --git a/tests/Unit/Domain/Subscription/Service/SubscriberCsvExporterTest.php b/tests/Unit/Domain/Subscription/Service/SubscriberCsvExporterTest.php
@@ -17,7 +17,7 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Response;
 
-class SubscriberCsvExportManagerTest extends TestCase
+class SubscriberCsvExporterTest extends TestCase
 {
     private SubscriberAttributeManager&MockObject $attributeManagerMock;
     private SubscriberRepository&MockObject $subscriberRepositoryMock;
diff --git a/tests/Unit/Domain/Subscription/Service/SubscriberCsvImporterTest.php b/tests/Unit/Domain/Subscription/Service/SubscriberCsvImporterTest.php
@@ -20,7 +20,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class SubscriberCsvImportManagerTest extends TestCase
+class SubscriberCsvImporterTest extends TestCase
 {
     private SubscriberManager&MockObject $subscriberManagerMock;
     private SubscriberAttributeManager&MockObject $attributeManagerMock;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;`
`9`	`9`	`use PhpList\Core\Domain\Subscription\Model\Subscriber;`
`10`	`10`
`11`		`-class SubscriptionHistoryFilter implements FilterRequestInterface`
	`11`	`+class SubscriberHistoryFilter implements FilterRequestInterface`
`12`	`12`	`{`
`13`	`13`	`private ?Subscriber $subscriber;`
`14`	`14`	`private ?string $ip;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use PhpList\Core\Domain\Common\Repository\AbstractRepository;`
`10`	`10`	`use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;`
`11`	`11`	`use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;`
`12`		`-use PhpList\Core\Domain\Subscription\Model\Filter\SubscriptionHistoryFilter;`
	`12`	`+use PhpList\Core\Domain\Subscription\Model\Filter\SubscriberHistoryFilter;`
`13`	`13`	`use PhpList\Core\Domain\Subscription\Model\SubscriberHistory;`
`14`	`14`
`15`	`15`	`class SubscriberHistoryRepository extends AbstractRepository implements PaginatableRepositoryInterface`
`@@ -24,7 +24,7 @@ public function getFilteredAfterId(int $lastId, int $limit, ?FilterRequestInterf`
`24`	`24`	`{`
`25`	`25`	`$queryBuilder = $this->createQueryBuilder('sh');`
`26`	`26`
`27`		`- if (!$filter instanceof SubscriptionHistoryFilter) {`
	`27`	`+ if (!$filter instanceof SubscriberHistoryFilter) {`
`28`	`28`	`throw new InvalidArgumentException('Expected SubscriptionHistoryFilter.');`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace PhpList\Core\Domain\Subscription\Service;`
	`5`	`+namespace PhpList\Core\Domain\Subscription\Service\Manager;`
`6`	`6`
`7`		`-use PhpList\Core\Domain\Subscription\Model\Filter\SubscriptionHistoryFilter;`
	`7`	`+use PhpList\Core\Domain\Subscription\Model\Filter\SubscriberHistoryFilter;`
`8`	`8`	`use PhpList\Core\Domain\Subscription\Repository\SubscriberHistoryRepository;`
`9`	`9`
`10`		`-class SubscriptionHistoryService`
	`10`	`+class SubscriberHistoryManager`
`11`	`11`	`{`
`12`	`12`	`private SubscriberHistoryRepository $repository;`
`13`	`13`
`@@ -16,7 +16,7 @@ public function __construct(SubscriberHistoryRepository $repository)`
`16`	`16`	`$this->repository = $repository;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public function getHistory(int $lastId, int $limit, SubscriptionHistoryFilter $filter): array`
	`19`	`+ public function getHistory(int $lastId, int $limit, SubscriberHistoryFilter $filter): array`
`20`	`20`	`{`
`21`	`21`	`return $this->repository->getFilteredAfterId($lastId, $limit, $filter);`
`22`	`22`	`}`