Merge d20536e into c46208e

Unleash · Apr 16, 2024 · 0560fc7 · 0560fc7
2 parents c46208e + d20536e
commit 0560fc7
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 7 deletions.
diff --git a/src/Configuration/UnleashConfiguration.php b/src/Configuration/UnleashConfiguration.php
@@ -5,6 +5,7 @@
 use JetBrains\PhpStorm\Pure;
 use LogicException;
 use Psr\SimpleCache\CacheInterface;
+use Stringable;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Unleash\Client\Bootstrap\BootstrapHandler;
@@ -22,9 +23,9 @@ final class UnleashConfiguration
      * @param array<string,string> $headers
      */
     public function __construct(
-        private string $url,
-        private string $appName,
-        private string $instanceId,
+        private string|Stringable $url,
+        private string|Stringable $appName,
+        private string|Stringable $instanceId,
         private ?CacheInterface $cache = null,
         private int $ttl = 30,
         private int $metricsInterval = 30_000,
@@ -71,7 +72,7 @@ public function getUrl(): string
             $url .= '/';
         }
 
-        return $url;
+        return (string) $url;
     }
 
     public function getAppName(): string
@@ -146,21 +147,21 @@ public function isMetricsEnabled(): bool
         return $this->metricsEnabled;
     }
 
-    public function setUrl(string $url): self
+    public function setUrl(string|Stringable $url): self
     {
         $this->url = $url;
 
         return $this;
     }
 
-    public function setAppName(string $appName): self
+    public function setAppName(string|Stringable $appName): self
     {
         $this->appName = $appName;
 
         return $this;
     }
 
-    public function setInstanceId(string $instanceId): self
+    public function setInstanceId(string|Stringable $instanceId): self
     {
         $this->instanceId = $instanceId;
 

diff --git a/tests/Configuration/UnleashConfigurationTest.php b/tests/Configuration/UnleashConfigurationTest.php
@@ -111,4 +111,48 @@ public function testGetMetricsUrl()
         $resolvedMetricsUrl = $proxyInstance->getMetricsUrl();
         self::assertSame($resolvedMetricsUrl, 'http://localhost:3063/api/frontend/client/metrics');
     }
+
+    public function testStringable()
+    {
+        $realUrl = 'http://localhost:3063/api/';
+        $realAppName = 'TestApp';
+        $realInstanceId = '123';
+
+        $shadowed = function (string &$value) {
+            return new class($value) {
+                /**
+                 * @var string
+                 */
+                private $realUrl;
+
+                public function __construct(
+                    string &$realUrl
+                ) {
+                    $this->realUrl = &$realUrl;
+                }
+
+                public function __toString(): string
+                {
+                    return $this->realUrl;
+                }
+            };
+        };
+
+        $url = $shadowed($realUrl);
+        $appName = $shadowed($realAppName);
+        $instanceId = $shadowed($realInstanceId);
+
+        $instance = new UnleashConfiguration($url, $appName, $instanceId);
+        self::assertSame($realUrl, (string) $instance->getUrl());
+        self::assertSame($realAppName, (string) $instance->getAppName());
+        self::assertSame($realInstanceId, (string) $instance->getInstanceId());
+
+        $realUrl = 'http://localhost:3063/api/v2/';
+        $realAppName = 'TestApp2';
+        $realInstanceId = '456';
+
+        self::assertSame($realUrl, (string) $instance->getUrl());
+        self::assertSame($realAppName, (string) $instance->getAppName());
+        self::assertSame($realInstanceId, (string) $instance->getInstanceId());
+    }
 }