1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-05 12:47:39 +02:00
This commit is contained in:
Jordi Boggiano
2018-12-08 18:16:32 +01:00
parent b978700c05
commit 0ad73a526f
16 changed files with 25 additions and 21 deletions

View File

@@ -65,7 +65,7 @@ class ElasticaFormatter extends NormalizerFormatter
/** /**
* Convert a log message into an Elastica Document * Convert a log message into an Elastica Document
* @param array $record * @param array $record
* @return Document * @return Document
*/ */
protected function getDocument(array $record): Document protected function getDocument(array $record): Document

View File

@@ -32,7 +32,7 @@ class ElasticsearchFormatter extends NormalizerFormatter
/** /**
* @param string $index Elasticsearch index name * @param string $index Elasticsearch index name
* @param string $type Elasticsearch record type * @param string $type Elasticsearch record type
*/ */
public function __construct(string $index, string $type) public function __construct(string $index, string $type)
{ {

View File

@@ -81,6 +81,7 @@ class ElasticaHandler extends AbstractProcessingHandler
if ($formatter instanceof ElasticaFormatter) { if ($formatter instanceof ElasticaFormatter) {
return parent::setFormatter($formatter); return parent::setFormatter($formatter);
} }
throw new \InvalidArgumentException('ElasticaHandler is only compatible with ElasticaFormatter'); throw new \InvalidArgumentException('ElasticaHandler is only compatible with ElasticaFormatter');
} }

View File

@@ -89,6 +89,7 @@ class ElasticsearchHandler extends AbstractProcessingHandler
if ($formatter instanceof ElasticsearchFormatter) { if ($formatter instanceof ElasticsearchFormatter) {
return parent::setFormatter($formatter); return parent::setFormatter($formatter);
} }
throw new InvalidArgumentException('ElasticsearchHandler is only compatible with ElasticsearchFormatter'); throw new InvalidArgumentException('ElasticsearchHandler is only compatible with ElasticsearchFormatter');
} }
@@ -122,7 +123,7 @@ class ElasticsearchHandler extends AbstractProcessingHandler
/** /**
* Use Elasticsearch bulk API to send list of documents * Use Elasticsearch bulk API to send list of documents
* *
* @param array $records * @param array $records
* @throws \RuntimeException * @throws \RuntimeException
*/ */
protected function bulkSend(array $records): void protected function bulkSend(array $records): void

View File

@@ -39,8 +39,8 @@ class ZendMonitorHandler extends AbstractProcessingHandler
]; ];
/** /**
* @param string|int $level The minimum logging level at which this handler will be triggered. * @param string|int $level The minimum logging level at which this handler will be triggered.
* @param bool $bubble Whether the messages that are handled can bubble up the stack or not. * @param bool $bubble Whether the messages that are handled can bubble up the stack or not.
* @throws MissingExtensionException * @throws MissingExtensionException
*/ */
public function __construct($level = Logger::DEBUG, bool $bubble = true) public function __construct($level = Logger::DEBUG, bool $bubble = true)

View File

@@ -1,4 +1,4 @@
<?php <?php declare(strict_types=1);
/* /*
* This file is part of the Monolog package. * This file is part of the Monolog package.

View File

@@ -1,4 +1,4 @@
<?php <?php declare(strict_types=1);
/* /*
* This file is part of the Monolog package. * This file is part of the Monolog package.

View File

@@ -1,4 +1,4 @@
<?php <?php declare(strict_types=1);
/* /*
* This file is part of the Monolog package. * This file is part of the Monolog package.

View File

@@ -1,4 +1,4 @@
<?php <?php declare(strict_types=1);
/* /*
* This file is part of the Monolog package. * This file is part of the Monolog package.

View File

@@ -69,7 +69,9 @@ class JsonFormatterTest extends TestCase
"channel": "test", "channel": "test",
"datetime": "'.$record['datetime']->format('Y-m-d\TH:i:s.uP').'", "datetime": "'.$record['datetime']->format('Y-m-d\TH:i:s.uP').'",
"extra": {} "extra": {}
}', $formatter->format($record)); }',
$formatter->format($record)
);
$formatter->setJsonPrettyPrint(false); $formatter->setJsonPrettyPrint(false);
$record = $this->getRecord(); $record = $this->getRecord();

View File

@@ -183,6 +183,7 @@ class ElasticaHandlerTest extends TestCase
$client = new Client(); $client = new Client();
$handler = new ElasticaHandler($client, $this->options); $handler = new ElasticaHandler($client, $this->options);
try { try {
$handler->handleBatch([$msg]); $handler->handleBatch([$msg]);
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {

View File

@@ -80,7 +80,7 @@ class ElasticsearchHandlerTest extends TestCase
], ],
], ],
$data, $data,
] ],
]; ];
// setup ES client mock // setup ES client mock
@@ -229,7 +229,7 @@ class ElasticsearchHandlerTest extends TestCase
/** /**
* Return last created document id from ES response * Return last created document id from ES response
* *
* @param array $info Elasticsearch last request info * @param array $info Elasticsearch last request info
* @return string|null * @return string|null
*/ */
protected function getCreatedDocId(array $info) protected function getCreatedDocId(array $info)
@@ -255,7 +255,7 @@ class ElasticsearchHandlerTest extends TestCase
$params = [ $params = [
'index' => $index, 'index' => $index,
'type' => $type, 'type' => $type,
'id' => $documentId 'id' => $documentId,
]; ];
$data = $client->get($params); $data = $client->get($params);

View File

@@ -12,9 +12,9 @@
namespace Monolog\Handler; namespace Monolog\Handler;
use Monolog\Test\TestCase; use Monolog\Test\TestCase;
use Monolog\Logger; use Monolog\Logger;
/** /**
* @author Robert Kaufmann III <rok3@rok3.me> * @author Robert Kaufmann III <rok3@rok3.me>
* @author Gabriel Machado <gabriel.ms1@hotmail.com> * @author Gabriel Machado <gabriel.ms1@hotmail.com>
*/ */

View File

@@ -294,7 +294,7 @@ class RavenHandlerTest extends TestCase
$this->assertSame('test', $breadcrumbs[1]['category']); $this->assertSame('test', $breadcrumbs[1]['category']);
$this->assertSame('info', $breadcrumbs[1]['level']); $this->assertSame('info', $breadcrumbs[1]['level']);
$this->assertSame('Step 2: prepare user redirect', $breadcrumbs[1]['message']); $this->assertSame('Step 2: prepare user redirect', $breadcrumbs[1]['message']);
$handler->resetBreadcrumbs(); $handler->resetBreadcrumbs();
$handler->handle($this->getRecord(Logger::INFO, 'Hello!')); $handler->handle($this->getRecord(Logger::INFO, 'Hello!'));
$this->assertEmpty($ravenClient->breadcrumbs->fetch()); $this->assertEmpty($ravenClient->breadcrumbs->fetch());

View File

@@ -666,7 +666,7 @@ class LoggerTest extends \PHPUnit\Framework\TestCase
$assertBufferOfBufferHandlerEmpty = function () use ($getProperty, $bufferHandler, $that) { $assertBufferOfBufferHandlerEmpty = function () use ($getProperty, $bufferHandler, $that) {
$that->assertEmpty($getProperty($bufferHandler, 'buffer')); $that->assertEmpty($getProperty($bufferHandler, 'buffer'));
}; };
$assertBuffersEmpty = function() use ($assertBufferOfBufferHandlerEmpty, $getProperty, $fingersCrossedHandler, $that) { $assertBuffersEmpty = function () use ($assertBufferOfBufferHandlerEmpty, $getProperty, $fingersCrossedHandler, $that) {
$assertBufferOfBufferHandlerEmpty(); $assertBufferOfBufferHandlerEmpty();
$that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer')); $that->assertEmpty($getProperty($fingersCrossedHandler, 'buffer'));
}; };

View File

@@ -1,4 +1,4 @@
<?php <?php declare(strict_types=1);
/* /*
* This file is part of the Monolog package. * This file is part of the Monolog package.
@@ -22,7 +22,6 @@ use Monolog\Test\TestCase;
*/ */
class SignalHandlerTest extends TestCase class SignalHandlerTest extends TestCase
{ {
private $asyncSignalHandling; private $asyncSignalHandling;
private $blockedSignals; private $blockedSignals;
private $signalHandlers; private $signalHandlers;
@@ -56,7 +55,8 @@ class SignalHandlerTest extends TestCase
} }
} }
private function setSignalHandler($signo, $handler = SIG_DFL) { private function setSignalHandler($signo, $handler = SIG_DFL)
{
if (function_exists('pcntl_signal_get_handler')) { if (function_exists('pcntl_signal_get_handler')) {
$this->signalHandlers[$signo] = pcntl_signal_get_handler($signo); $this->signalHandlers[$signo] = pcntl_signal_get_handler($signo);
} else { } else {
@@ -284,5 +284,4 @@ class SignalHandlerTest extends TestCase
array(true, true, 1, 1), array(true, true, 1, 1),
); );
} }
} }