From 0ffe719abfd14595cd5b55875bbe5b29599548d8 Mon Sep 17 00:00:00 2001 From: Tom Carrio Date: Sat, 20 May 2023 09:28:46 -0400 Subject: [PATCH 1/4] style: import dd-trace hook before use in _autoload.php Signed-off-by: Tom Carrio --- hooks/DDTrace/src/_autoload.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hooks/DDTrace/src/_autoload.php b/hooks/DDTrace/src/_autoload.php index 64da5504..8d397662 100644 --- a/hooks/DDTrace/src/_autoload.php +++ b/hooks/DDTrace/src/_autoload.php @@ -2,5 +2,7 @@ declare(strict_types=1); +use OpenFeature\Hooks\DDTrace\DDTraceHook; + // automatically registers the DDTraceHook for OpenFeature -OpenFeature\Hooks\DDTrace\DDTraceHook::register(); +DDTraceHook::register(); From fdd3843184bcdb027919c515c3602d95d2e5b20f Mon Sep 17 00:00:00 2001 From: Tom Carrio Date: Sat, 20 May 2023 09:32:46 -0400 Subject: [PATCH 2/4] style: import before use in otel _autoload.php Signed-off-by: Tom Carrio --- hooks/OpenTelemetry/src/_autoload.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hooks/OpenTelemetry/src/_autoload.php b/hooks/OpenTelemetry/src/_autoload.php index 69fb8174..ac8b3881 100644 --- a/hooks/OpenTelemetry/src/_autoload.php +++ b/hooks/OpenTelemetry/src/_autoload.php @@ -2,5 +2,7 @@ declare(strict_types=1); +use OpenFeature\Hooks\OpenTelemetry\OpenTelemetryHook; + // automatically registers the OTel hook for OpenFeature -OpenFeature\Hooks\OpenTelemetry\OpenTelemetryHook::register(); +OpenTelemetryHook::register(); From d27def730b829817b56a02f77d2e21c7c7ff5928 Mon Sep 17 00:00:00 2001 From: Tom Carrio Date: Sat, 20 May 2023 09:38:53 -0400 Subject: [PATCH 3/4] refactor: support logger in SplitProvider Signed-off-by: Tom Carrio --- providers/Split/src/SplitProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/Split/src/SplitProvider.php b/providers/Split/src/SplitProvider.php index ae9df27e..9a4dc465 100644 --- a/providers/Split/src/SplitProvider.php +++ b/providers/Split/src/SplitProvider.php @@ -70,7 +70,7 @@ public function __construct(?string $apiKey = '', array $options = []) $this->client = $factory->client(); } - public function setLogger(LoggerInterface $logger) + public function setLogger(LoggerInterface $logger): void { Di::setLogger($logger); } From 18a58b2f684101daa2d378444e68d222897812ea Mon Sep 17 00:00:00 2001 From: Tom Carrio Date: Sat, 20 May 2023 09:49:07 -0400 Subject: [PATCH 4/4] test: return using stringable magic method FlagdProviderTest.php Signed-off-by: Tom Carrio --- providers/Flagd/tests/unit/FlagdProviderTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/Flagd/tests/unit/FlagdProviderTest.php b/providers/Flagd/tests/unit/FlagdProviderTest.php index 25b70c87..8777e11b 100644 --- a/providers/Flagd/tests/unit/FlagdProviderTest.php +++ b/providers/Flagd/tests/unit/FlagdProviderTest.php @@ -57,7 +57,7 @@ public function testCanInstantiateHttpWithConfigObject(): void $mockStreamFactory->shouldReceive('createStream')->andReturn($mockStream); $mockResponse = $this->mockery(ResponseInterface::class); - $mockResponse->shouldReceive('getBody')->andReturn("{ + $mockResponse->shouldReceive('getBody->__toString')->andReturn("{ \"value\":\"{$expectedValue}\", \"variant\":\"{$expectedVariant}\", \"reason\":\"{$expectedReason}\" @@ -111,7 +111,7 @@ public function testCanInstantiateHttpWithConfigArray(): void $mockStreamFactory->shouldReceive('createStream')->andReturn($mockStream); $mockResponse = $this->mockery(ResponseInterface::class); - $mockResponse->shouldReceive('getBody')->andReturn("{ + $mockResponse->shouldReceive('getBody->__toString')->andReturn("{ \"value\":\"{$expectedValue}\", \"variant\":\"{$expectedVariant}\", \"reason\":\"{$expectedReason}\"