Skip to content

use \Psr\Log\LoggerInterface::warning instead of \Monolog\Logger::warn in \LaunchDarkly\LDClient #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2017
Merged

use \Psr\Log\LoggerInterface::warning instead of \Monolog\Logger::warn in \LaunchDarkly\LDClient #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/LaunchDarkly/LDClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class LDClient {
protected $_send_events = true;
/** @var array|mixed */
protected $_defaults = array();
/** @var mixed|LoggerInterface */
/** @var LoggerInterface */
protected $_logger;

/** @var FeatureRequester */
Expand Down Expand Up @@ -113,11 +113,11 @@ public function variation($key, $user, $default = false) {
try {
if (is_null($user) || is_null($user->getKey())) {
$this->_sendFlagRequestEvent($key, $user, $default, $default);
$this->_logger->warn("Variation called with null user or null user key! Returning default value");
$this->_logger->warning("Variation called with null user or null user key! Returning default value");
return $default;
}
if ($user->isKeyBlank()) {
$this->_logger->warn("User key is blank. Flag evaluation will proceed, but the user will not be stored in LaunchDarkly.");
$this->_logger->warning("User key is blank. Flag evaluation will proceed, but the user will not be stored in LaunchDarkly.");
}
$flag = $this->_featureRequester->get($key);

Expand Down Expand Up @@ -178,7 +178,7 @@ public function track($eventName, $user, $data) {
return;
}
if (is_null($user) || $user->isKeyBlank()) {
$this->_logger->warn("Track called with null user or null/empty user key!");
$this->_logger->warning("Track called with null user or null/empty user key!");
}

$event = array();
Expand All @@ -200,7 +200,7 @@ public function identify($user) {
return;
}
if (is_null($user) || $user->isKeyBlank()) {
$this->_logger->warn("Track called with null user or null/empty user key!");
$this->_logger->warning("Track called with null user or null/empty user key!");
}

$event = array();
Expand Down
17 changes: 17 additions & 0 deletions tests/LDClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use LaunchDarkly\LDClient;
use LaunchDarkly\LDUser;
use LaunchDarkly\LDUserBuilder;
use Psr\Log\LoggerInterface;


class LDClientTest extends \PHPUnit_Framework_TestCase {
Expand Down Expand Up @@ -64,6 +65,22 @@ public function testSecureModeHash() {
$user = new LDUser("Message");
$this->assertEquals("aa747c502a898200f9e4fa21bac68136f886a0e27aec70ba06daf2e2a5cb5597", $client->secureModeHash($user));
}

public function testLoggerInterfaceWarn()
{
// Use LoggerInterface impl, instead of concreate Logger from Monolog, to demonstrate the problem with `warn`.
$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();

$logger->expects(self::atLeastOnce())->method('warning');

$client = new LDClient('secret', [
'logger' => $logger,
]);

$user = new LDUser('');

$client->variation('MyFeature', $user);
}
}


Expand Down