feat: move logger and client to constructor in factory

shopware · May 11, 2023 · c378f88 · c378f88
1 parent 3197619
commit c378f88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/HttpClient/ClientFactory.php b/src/HttpClient/ClientFactory.php
@@ -13,12 +13,15 @@
 
 class ClientFactory
 {
-    public function __construct(private readonly CacheInterface $cache = new NullCache())
-    {
+    public function __construct(
+        private readonly CacheInterface $cache = new NullCache(),
+        private readonly ClientInterface $client = new Psr18Client(),
+        private readonly LoggerInterface $logger = new NullLogger()
+    ) {
     }
 
-    public function createClient(ShopInterface $shop, ClientInterface $client = new Psr18Client(), LoggerInterface $logger = new NullLogger()): ClientInterface
+    public function createClient(ShopInterface $shop): ClientInterface
     {
-        return new AuthenticatedClient(new LoggerClient($client, $logger), $shop, $this->cache);
+        return new AuthenticatedClient(new LoggerClient($this->client, $this->logger), $shop, $this->cache);
     }
 }
diff --git a/tests/HttpClient/ClientFactoryTest.php b/tests/HttpClient/ClientFactoryTest.php
@@ -41,8 +41,8 @@ public function testFactoryOwnClient(): void
             ->method('sendRequest')
             ->willReturn(new Response(200, [], '{"access_token": "a", "expires_in": 3600}'));
 
-        $factory = new ClientFactory();
-        $client = $factory->createClient(new MockShop('shop-id', 'shop-secret', ''), $testClient);
+        $factory = new ClientFactory(new NullCache(), $testClient);
+        $client = $factory->createClient(new MockShop('shop-id', 'shop-secret', ''));
 
         $client->sendRequest(new Request('GET', 'https://example.com'));
     }