updates

Author: fahad19

README.md

@@ -24,8 +24,8 @@ This SDK is compatible with [Featurevisor](https://featurevisor.com/) v2.0 proje
   - [Set sticky afterwards](#set-sticky-afterwards)
 - [Setting datafile](#setting-datafile)
   - [Updating datafile](#updating-datafile)
-  - [Interval-based update](#interval-based-update)
 - [Logging](#logging)
+  - [Levels](#levels)
   - [Customizing levels](#customizing-levels)
   - [Handler](#handler)
 - [Events](#events)
@@ -347,18 +347,21 @@ The triggers for setting the datafile again can be:
   - a specific event in your application (like a user action), or
   - an event served via websocket or server-sent events (SSE)
 
-### Interval-based update
-
-Here's an example of using interval-based update:
-
-@TODO
-
 ## Logging
 
 By default, Featurevisor SDKs will print out logs to the console for `info` level and above.
 Featurevisor PHP-SDK by default uses [PSR-3 standard](https://www.php-fig.org/psr/psr-3/) simple implementation.
 You can also choose from many mature implementations like e.g. [Monolog](https://github.com/Seldaek/monolog)
 
+### Levels
+
+These are all the available log levels:
+
+- `error`
+- `warning`
+- `info`
+- `debug`
+
 ### Customizing levels
 
 If you choose `debug` level to make the logs more verbose, you can set it at the time of SDK initialization.
@@ -416,8 +419,6 @@ Featurevisor SDK implements a simple event emitter that allows you to listen to
 
 You can listen to these events that can occur at various stages in your application:
 
-@TODO: verify these events
-
 ### `datafile_set`
 
 ```php
@@ -515,8 +516,8 @@ $myCustomHook = [
   // rest of the properties below are all optional per hook
 
   // before evaluation
-  'before' => function (options) {
-    $type = $options['type']; // `feature` | `variation` | `variable`
+  'before' => function ($options) {
+    $type = $options['type']; // `flag` | `variation` | `variable`
     $featureKey = $options['featureKey'];
     $variableKey = $options['variableKey']; // if type is `variable`
     $context = $options['context'];

src/Featurevisor.php

@@ -4,7 +4,7 @@
 
 use Closure;
 use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
+use Psr\Log\LogLevel;
 
 class Featurevisor
 {
@@ -18,6 +18,7 @@ class Featurevisor
     /**
      * @param array{
      *     datafile?: string|array<string, mixed>,
+     *     logLevel?: LogLevel::*|string,
      *     logger?: LoggerInterface,
      *     context?: array<string, mixed>,
      *     sticky?: array<string, mixed>,
@@ -33,7 +34,9 @@ class Featurevisor
      */
     public static function createInstance(array $options): self
     {
-        $logger = $options['logger'] ?? new NullLogger();
+        $logger = $options['logger'] ?? Logger::create([
+            'level' => $options['logLevel'] ?? Logger::DEFAULT_LEVEL,
+        ]);
 
         return new self(
             isset($options['datafile'])
@@ -114,6 +117,13 @@ public function getFeature(string $featureKey): ?array
         return $this->datafileReader->getFeature($featureKey);
     }
 
+    public function setLogLevel(string $level): void
+    {
+        if (method_exists($this->logger, 'setLevel')) {
+            $this->logger->setLevel($level);
+        }
+    }
+
     public function addHook(array $hook): ?callable
     {
         return $this->hooksManager->add($hook);

src/Logger.php

@@ -44,10 +44,10 @@ public static function create(array $options = []): self
         );
     }
 
-    public function __construct(string $level = self::DEFAULT_LEVEL, Closure $handler = null)
+    public function __construct(string $level = self::DEFAULT_LEVEL, ?Closure $handler = null)
     {
         $this->handler = $handler ?? static fn ($level, $message, array $context) => self::defaultLogHandler($level, $message, $context);
-        $this->level = $level;
+        $this->setLevel($level);
     }
 
     public function setLevel(string $level): void
@@ -61,7 +61,13 @@ public function setLevel(string $level): void
 
     public function log($level, $message, array $context = []): void
     {
-        $shouldHandle = array_search($this->level, self::ALL_LEVELS) >= array_search($level, self::ALL_LEVELS);
+        $level = (string) $level;
+
+        if (!in_array($level, self::ALL_LEVELS, true)) {
+            throw new InvalidArgumentException('Invalid log level');
+        }
+
+        $shouldHandle = array_search($this->level, self::ALL_LEVELS, true) >= array_search($level, self::ALL_LEVELS, true);
 
         if (!$shouldHandle) {
             return;
@@ -85,4 +91,5 @@ private static function defaultLogHandler($level, $message, ?array $details = nu
             ) . PHP_EOL
         );
     }
+
 }

tests/FeaturevisorTest.php

@@ -23,6 +23,58 @@ public function testShouldCreateInstanceWithDatafileContent()
         self::assertTrue(method_exists($sdk, 'getVariation'));
     }
 
+    public function testShouldCreateInstanceWithLogLevel()
+    {
+        $logs = [];
+        $sdk = Featurevisor::createInstance([
+            'logLevel' => LogLevel::DEBUG,
+            'logger' => Logger::create([
+                'level' => LogLevel::ERROR,
+                'handler' => function ($level, $message, $context) use (&$logs) {
+                    $logs[] = compact('level', 'message', 'context');
+                },
+            ]),
+            'datafile' => [
+                'schemaVersion' => '2',
+                'revision' => '1.0',
+                'features' => [],
+                'segments' => [],
+            ],
+        ]);
+
+        $sdk->setContext(['userId' => '123']);
+
+        // logger option should take precedence over logLevel option
+        self::assertCount(0, $logs);
+    }
+
+    public function testShouldSetLogLevelAfterInitialization()
+    {
+        $logs = [];
+        $sdk = Featurevisor::createInstance([
+            'logger' => Logger::create([
+                'level' => LogLevel::ERROR,
+                'handler' => function ($level, $message, $context) use (&$logs) {
+                    $logs[] = compact('level', 'message', 'context');
+                },
+            ]),
+            'datafile' => [
+                'schemaVersion' => '2',
+                'revision' => '1.0',
+                'features' => [],
+                'segments' => [],
+            ],
+        ]);
+
+        $sdk->setContext(['userId' => '123']);
+        self::assertCount(0, $logs);
+
+        $sdk->setLogLevel(LogLevel::DEBUG);
+        $sdk->setContext(['country' => 'nl']);
+        self::assertCount(1, $logs);
+        self::assertSame('debug', $logs[0]['level']);
+    }
+
     public function testShouldConfigurePlainBucketBy()
     {
         $capturedBucketKey = '';

tests/HelpersTest.php

@@ -20,10 +20,16 @@ public function testShouldResolveSupportedTypes()
         self::assertSame(['1', '2'], Helpers::getValueByType(['1', '2'], 'array'));
         self::assertSame(1, Helpers::getValueByType('1', 'integer'));
         self::assertSame(1.1, Helpers::getValueByType('1.1', 'double'));
+        self::assertSame(['x' => 1], Helpers::getValueByType(['x' => 1], 'json'));
     }
 
     public function testShouldReturnNullForNullValue()
     {
         self::assertNull(Helpers::getValueByType(null, 'string'));
     }
+
+    public function testShouldReturnNullWhenCallablePassedForString()
+    {
+        self::assertNull(Helpers::getValueByType(static fn () => true, 'string'));
+    }
 }