Skip to content

Commit 50e39f4

Browse files
committed
fixed tests
1 parent afa2568 commit 50e39f4

5 files changed

Lines changed: 17 additions & 14 deletions

File tree

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"require-dev": {
3232
"phpunit/phpunit": "^9.0.0",
3333
"squizlabs/php_codesniffer": "3.*",
34-
"rogervila/php-sonarqube-scanner": "1.1.0"
34+
"rogervila/php-sonarqube-scanner": "1.1.0",
35+
"monolog/monolog": "^2.8|^3.0"
3536
},
3637

3738
"autoload": {

src/SplitIO/Component/Initialization/LoggerFactory.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88

99
class LoggerFactory
1010
{
11+
private static function setDefaultLogger(array $options) {
12+
$adapter = (isset($options['adapter'])) ? $options['adapter'] : null;
13+
$level = (isset($options['level'])) ? $options['level'] : null;
14+
15+
LoggerTrait::addLogger($adapter, $level);
16+
}
17+
1118
public static function setupLogger(array $options) {
1219
if (!isset($options['psr3-instance'])) {
13-
$adapter = (isset($options['adapter'])) ? $options['adapter'] : null;
14-
$level = (isset($options['level'])) ? $options['level'] : null;
15-
16-
LoggerTrait::addLogger($adapter, $level);
20+
self::setDefaultLogger($options);
1721
return;
1822
}
1923

@@ -33,10 +37,7 @@ public static function setupLogger(array $options) {
3337
LoggerTrait::addLogger(null, null, new Logger(new LoggerAdapterPSR3v1($options['psr3-instance'])));
3438
break;
3539
default:
36-
$adapter = (isset($options['adapter'])) ? $options['adapter'] : null;
37-
$level = (isset($options['level'])) ? $options['level'] : null;
38-
39-
LoggerTrait::addLogger($adapter, $level);
40+
self::setDefaultLogger($options);
4041
}
4142
}
4243
}

src/SplitIO/Component/Log/LoggerAdapterPSR3v2.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function write($logLevel, $message)
3636
if (!is_string($message) || !$message instanceof Stringable) {
3737
$message = json_encode($message);
3838
}
39-
$this->logger->write($logLevel, $message);
39+
$this->logger->log($logLevel, $message);
4040
} catch (\Exception $e) {
4141
}
4242
}

src/SplitIO/Component/Log/LoggerAdapterPSR3v3.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function write($logLevel, $message)
3636
if (!is_string($message) || !$message instanceof Stringable) {
3737
$message = json_encode($message);
3838
}
39-
$this->logger->write($logLevel, $message);
39+
$this->logger->log($logLevel, $message);
4040
} catch (\Exception $e) {
4141
}
4242
}

tests/Suite/Sdk/SdkClientTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
namespace SplitIO\Test\Suite\Sdk;
33

44
use \stdClass;
5+
use Monolog\Logger;
6+
use Monolog\Handler\ErrorLogHandler;
57
use SplitIO\Component\Common\Di;
68
use SplitIO\Test\Suite\Redis\ReflectiveTools;
79
use SplitIO\Component\Cache\ImpressionCache;
@@ -423,16 +425,16 @@ public function testClient()
423425
*/
424426
public function testCustomLog()
425427
{
426-
/*
427428
Di::set(Di::KEY_FACTORY_TRACKER, false);
428429
// create a log channel
429430
$log = new Logger('SplitIO');
431+
$log->pushHandler(new ErrorLogHandler(ErrorLogHandler::OPERATING_SYSTEM, Logger::INFO));
430432

431433
$parameters = array('scheme' => 'redis', 'host' => REDIS_HOST, 'port' => REDIS_PORT, 'timeout' => 881);
432434
$options = array('prefix' => TEST_PREFIX);
433435

434436
$sdkConfig = array(
435-
'log' => array('psr3-instance' => $log),
437+
'log' => array('psr3-instance' => $log, 'standard' => 'psr3-v3'),
436438
'cache' => array('adapter' => 'predis', 'parameters' => $parameters, 'options' => $options)
437439
);
438440

@@ -451,7 +453,6 @@ public function testCustomLog()
451453

452454
$this->assertTrue($splitSdk->isTreatment('user1', 'sample_feature', 'on'));
453455
$this->assertFalse($splitSdk->isTreatment('user1', 'sample_feature', 'invalid_treatment'));
454-
*/
455456
}
456457

457458
public function testInvalidCacheAdapter()

0 commit comments

Comments
 (0)