Remove getter of baseUrl and secret

Author: DigitalTimK

src/Util/UrlBuilder.php

@@ -43,12 +43,12 @@ class UrlBuilder
 
     private string $secret;
 
-    private string $serverBaseUrl;
+    private string $baseUrl;
 
-    public function __construct(string $secret, string $serverBaseUrl, string $hashingAlgorithm)
+    public function __construct(string $secret, string $baseUrl, string $hashingAlgorithm)
     {
         $this->setSecret($secret);
-        $this->setServerBaseUrl($serverBaseUrl);
+        $this->setBaseUrl($baseUrl);
         $this->setHashingAlgorithm($hashingAlgorithm);
     }
 
@@ -60,28 +60,18 @@ public function setSecret(string $secret): self
         return $this;
     }
 
-    public function getSecret(): string
-    {
-        return $this->secret;
-    }
-
-    public function setServerBaseUrl(string $serverBaseUrl): self
+    public function setBaseUrl(string $baseUrl): self
     {
         // add tailing dir-separator if missing
-        if ('/' != mb_substr($serverBaseUrl, -1)) {
-            $serverBaseUrl .= '/';
+        if ('/' != mb_substr($baseUrl, -1)) {
+            $baseUrl .= '/';
         }
 
-        $this->serverBaseUrl = $serverBaseUrl;
+        $this->baseUrl = $baseUrl;
 
         return $this;
     }
 
-    public function getServerBaseUrl(): string
-    {
-        return $this->serverBaseUrl;
-    }
-
     public function setHashingAlgorithm(string $hashingAlgorithm): self
     {
         $this->hashingAlgorithm = $hashingAlgorithm;
@@ -100,7 +90,7 @@ public function getHashingAlgorithm(): string
      */
     public function buildUrl(string $method = '', string $params = '', bool $append = true): string
     {
-        return $this->serverBaseUrl . 'api/' . $method . ($append ? '?' . $this->buildQs($method, $params) : '');
+        return $this->baseUrl . 'api/' . $method . ($append ? '?' . $this->buildQs($method, $params) : '');
     }
 
     /**

tests/Util/UrlBuilderTest.php

@@ -49,30 +49,24 @@ public function testSecret(): void
         // arrange
         $newSecret = $this->faker->password(128);
 
-        // initial value
-        $this->assertEquals('any secret', $this->urlBuilder->getSecret());
-
         // set new value
-        $this->urlBuilder->setSecret($newSecret);
-        $this->assertEquals($newSecret, $this->urlBuilder->getSecret());
+        $urlBuilder = $this->urlBuilder->setSecret($newSecret);
+        $this->assertInstanceOf(UrlBuilder::class, $urlBuilder);
     }
 
-    public function testServerBaseUrl(): void
+    public function testBaseUrl(): void
     {
         // arrange
         $urlWithoutTailingSeparator = $this->faker->url;
         $urlWithTailingSeparator    = $urlWithoutTailingSeparator . '/';
 
-        // initial value
-        $this->assertEquals('any url/', $this->urlBuilder->getServerBaseUrl());
-
         // set value 1 (without)
-        $this->urlBuilder->setServerBaseUrl($urlWithoutTailingSeparator);
-        $this->assertEquals($urlWithTailingSeparator, $this->urlBuilder->getServerBaseUrl());
+        $urlBuilder = $this->urlBuilder->setBaseUrl($urlWithoutTailingSeparator);
+        $this->assertInstanceOf(UrlBuilder::class, $urlBuilder);
 
         // set value 2 (with)
-        $this->urlBuilder->setServerBaseUrl($urlWithTailingSeparator);
-        $this->assertEquals($urlWithTailingSeparator, $this->urlBuilder->getServerBaseUrl());
+        $urlBuilder = $this->urlBuilder->setBaseUrl($urlWithTailingSeparator);
+        $this->assertInstanceOf(UrlBuilder::class, $urlBuilder);
     }
 
     public function testHashingAlgorithm(): void