mirror of
https://github.com/Seldaek/monolog.git
synced 2025-02-23 14:32:44 +01:00
Move record searching to its own method: hasRecordThatPasses()
This commit is contained in:
parent
29da1d8e77
commit
202d3750d6
@ -112,21 +112,13 @@ class TestHandler extends AbstractProcessingHandler
|
||||
|
||||
protected function hasRecord($record, $level)
|
||||
{
|
||||
if (!isset($this->recordsByLevel[$level])) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (is_array($record)) {
|
||||
$record = $record['message'];
|
||||
}
|
||||
|
||||
foreach ($this->recordsByLevel[$level] as $rec) {
|
||||
if ($rec['message'] === $record) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return $this->hasRecordThatPasses($level, function($rec) use ($record) {
|
||||
return $rec['message'] === $record;
|
||||
});
|
||||
}
|
||||
|
||||
public function hasEmergencyThatContains($message)
|
||||
@ -171,12 +163,23 @@ class TestHandler extends AbstractProcessingHandler
|
||||
|
||||
public function hasRecordThatContains($message, $level)
|
||||
{
|
||||
return $this->hasRecordThatPasses($level, function($rec) use ($message) {
|
||||
return strpos($rec['message'], $message) !== false;
|
||||
});
|
||||
}
|
||||
|
||||
public function hasRecordThatPasses($level, $predicate)
|
||||
{
|
||||
if (!is_callable($predicate)) {
|
||||
throw new \InvalidArgumentException("Expected a callable for hasRecordThatSucceeds");
|
||||
}
|
||||
|
||||
if (!isset($this->recordsByLevel[$level])) {
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach ($this->recordsByLevel[$level] as $rec) {
|
||||
if (strpos($rec['message'], $message) !== false) {
|
||||
foreach ($this->recordsByLevel[$level] as $i => $rec) {
|
||||
if (call_user_func($predicate, $rec, $i)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user