From 262a06f6243c5a86be4a7c24f0221d5b031eaba1 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Mon, 4 Jan 2021 15:16:51 +0100
Subject: [PATCH] Renamed method to be more consistent to what it actually does

---
 module/CLI/src/Command/Domain/ListDomainsCommand.php      | 4 ++--
 module/CLI/test/Command/Domain/ListDomainsCommandTest.php | 2 +-
 module/Core/src/Domain/DomainService.php                  | 2 +-
 module/Core/src/Domain/DomainServiceInterface.php         | 2 +-
 module/Core/test/Domain/DomainServiceTest.php             | 4 ++--
 module/Rest/src/Action/Domain/ListDomainsAction.php       | 2 +-
 module/Rest/test/Action/Domain/ListDomainsActionTest.php  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/CLI/src/Command/Domain/ListDomainsCommand.php b/module/CLI/src/Command/Domain/ListDomainsCommand.php
index b05ad429..ddcfa1bd 100644
--- a/module/CLI/src/Command/Domain/ListDomainsCommand.php
+++ b/module/CLI/src/Command/Domain/ListDomainsCommand.php
@@ -35,11 +35,11 @@ class ListDomainsCommand extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
-        $regularDomains = $this->domainService->listDomainsWithout();
+        $domains = $this->domainService->listDomains();
 
         ShlinkTable::fromOutput($output)->render(
             ['Domain', 'Is default'],
-            map($regularDomains, fn (DomainItem $domain) => [$domain->toString(), $domain->isDefault() ? 'Yes' : 'No']),
+            map($domains, fn (DomainItem $domain) => [$domain->toString(), $domain->isDefault() ? 'Yes' : 'No']),
         );
 
         return ExitCodes::EXIT_SUCCESS;
diff --git a/module/CLI/test/Command/Domain/ListDomainsCommandTest.php b/module/CLI/test/Command/Domain/ListDomainsCommandTest.php
index 05e35c0b..a0f79448 100644
--- a/module/CLI/test/Command/Domain/ListDomainsCommandTest.php
+++ b/module/CLI/test/Command/Domain/ListDomainsCommandTest.php
@@ -45,7 +45,7 @@ class ListDomainsCommandTest extends TestCase
         +---------+------------+
 
         OUTPUT;
-        $listDomains = $this->domainService->listDomainsWithout()->willReturn([
+        $listDomains = $this->domainService->listDomains()->willReturn([
             new DomainItem('foo.com', true),
             new DomainItem('bar.com', false),
             new DomainItem('baz.com', false),
diff --git a/module/Core/src/Domain/DomainService.php b/module/Core/src/Domain/DomainService.php
index 12211208..4e5e5da8 100644
--- a/module/Core/src/Domain/DomainService.php
+++ b/module/Core/src/Domain/DomainService.php
@@ -25,7 +25,7 @@ class DomainService implements DomainServiceInterface
     /**
      * @return DomainItem[]
      */
-    public function listDomainsWithout(): array
+    public function listDomains(): array
     {
         /** @var DomainRepositoryInterface $repo */
         $repo = $this->em->getRepository(Domain::class);
diff --git a/module/Core/src/Domain/DomainServiceInterface.php b/module/Core/src/Domain/DomainServiceInterface.php
index 2cff914f..ff89b7b1 100644
--- a/module/Core/src/Domain/DomainServiceInterface.php
+++ b/module/Core/src/Domain/DomainServiceInterface.php
@@ -11,5 +11,5 @@ interface DomainServiceInterface
     /**
      * @return DomainItem[]
      */
-    public function listDomainsWithout(): array;
+    public function listDomains(): array;
 }
diff --git a/module/Core/test/Domain/DomainServiceTest.php b/module/Core/test/Domain/DomainServiceTest.php
index 4192745f..ccdbf04c 100644
--- a/module/Core/test/Domain/DomainServiceTest.php
+++ b/module/Core/test/Domain/DomainServiceTest.php
@@ -30,13 +30,13 @@ class DomainServiceTest extends TestCase
      * @test
      * @dataProvider provideExcludedDomains
      */
-    public function listDomainsWithoutDelegatesIntoRepository(array $domains, array $expectedResult): void
+    public function listDomainsDelegatesIntoRepository(array $domains, array $expectedResult): void
     {
         $repo = $this->prophesize(DomainRepositoryInterface::class);
         $getRepo = $this->em->getRepository(Domain::class)->willReturn($repo->reveal());
         $findDomains = $repo->findDomainsWithout('default.com')->willReturn($domains);
 
-        $result = $this->domainService->listDomainsWithout();
+        $result = $this->domainService->listDomains();
 
         self::assertEquals($expectedResult, $result);
         $getRepo->shouldHaveBeenCalledOnce();
diff --git a/module/Rest/src/Action/Domain/ListDomainsAction.php b/module/Rest/src/Action/Domain/ListDomainsAction.php
index b3bb10bd..c35bb074 100644
--- a/module/Rest/src/Action/Domain/ListDomainsAction.php
+++ b/module/Rest/src/Action/Domain/ListDomainsAction.php
@@ -24,7 +24,7 @@ class ListDomainsAction extends AbstractRestAction
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $domainItems = $this->domainService->listDomainsWithout();
+        $domainItems = $this->domainService->listDomains();
 
         return new JsonResponse([
             'domains' => [
diff --git a/module/Rest/test/Action/Domain/ListDomainsActionTest.php b/module/Rest/test/Action/Domain/ListDomainsActionTest.php
index 940bb2fb..61d9a99f 100644
--- a/module/Rest/test/Action/Domain/ListDomainsActionTest.php
+++ b/module/Rest/test/Action/Domain/ListDomainsActionTest.php
@@ -33,7 +33,7 @@ class ListDomainsActionTest extends TestCase
             new DomainItem('bar.com', true),
             new DomainItem('baz.com', false),
         ];
-        $listDomains = $this->domainService->listDomainsWithout()->willReturn($domains);
+        $listDomains = $this->domainService->listDomains()->willReturn($domains);
 
         /** @var JsonResponse $resp */
         $resp = $this->action->handle(ServerRequestFactory::fromGlobals());