mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-01-17 20:58:32 +01:00
Code Issues Releases Wiki Activity

CS fixes

Browse Source
This commit is contained in:
Jordi Boggiano 2018-06-18 18:53:38 +02:00
parent fa9c4ebf3e
commit 41b8f5ebf4
29 changed files with 71 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.php_cs
View File

@ -24,14 +24,13 @@ return PhpCsFixer\Config::create()
'@PSR2' => true,
// some rules disabled as long as 1.x branch is maintained
'binary_operator_spaces' => array(
'align_double_arrow' => null,
'align_equals' => null,
'default' => null,
),
'blank_line_before_return' => true,
'cast_spaces' => true,
'header_comment' => array('header' => $header),
'blank_line_before_statement' => ['statements' => ['continue', 'declare', 'return', 'throw', 'try']],
'cast_spaces' => ['space' => 'single'],
'header_comment' => ['header' => $header],
'include' => true,
'method_separation' => true,
'class_attributes_separation' => ['elements' => ['method']],
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'no_empty_statement' => true,

2
src/Monolog/ErrorHandler.php
View File

@ -105,7 +105,7 @@ class ErrorHandler
}
/**
* @param string|null $level a LogLevel::* constant, null to use the default LogLevel::ALERT or false to disable fatal error handling
* @param string|null $level a LogLevel::* constant, null to use the default LogLevel::ALERT or false to disable fatal error handling
* @param int $reservedMemorySize Amount of KBs to reserve in memory so that it can be freed when handling fatal errors giving Monolog some room in memory to get its job done
*/
public function registerFatalHandler($level = null, int $reservedMemorySize = 20): self

4
src/Monolog/Handler/AbstractSyslogHandler.php
View File

@ -55,8 +55,8 @@ abstract class AbstractSyslogHandler extends AbstractProcessingHandler
/**
* @param mixed $facility
* @param 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 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
*/
public function __construct($facility = LOG_USER, $level = Logger::DEBUG, $bubble = true)
{

3
src/Monolog/Handler/BrowserConsoleHandler.php
View File

@ -141,7 +141,8 @@ class BrowserConsoleHandler extends AbstractProcessingHandler
if (empty($context) && empty($extra)) {
$script[] = static::call_array('log', static::handleStyles($record['formatted']));
} else {
$script = array_merge($script,
$script = array_merge(
$script,
[static::call_array('groupCollapsed', static::handleStyles($record['formatted']))],
$context,
$extra,

1
src/Monolog/Handler/ChromePHPHandler.php
View File

@ -24,7 +24,6 @@ use Monolog\Logger;
*/
class ChromePHPHandler extends AbstractProcessingHandler
{
use WebRequestRecognizerTrait;
/**

3
src/Monolog/Handler/CubeHandler.php
View File

@ -46,7 +46,8 @@ class CubeHandler extends AbstractProcessingHandler
if (!in_array($urlInfo['scheme'], $this->acceptedSchemes)) {
throw new \UnexpectedValueException(
'Invalid protocol (' . $urlInfo['scheme'] . ').'
. ' Valid options are ' . implode(', ', $this->acceptedSchemes));
. ' Valid options are ' . implode(', ', $this->acceptedSchemes)
);
}
$this->scheme = $urlInfo['scheme'];

1
src/Monolog/Handler/ElasticSearchHandler.php
View File

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

6
src/Monolog/Handler/ErrorLogHandler.php
View File

@ -40,6 +40,7 @@ class ErrorLogHandler extends AbstractProcessingHandler
if (false === in_array($messageType, self::getAvailableTypes(), true)) {
$message = sprintf('The given message type "%s" is not supported', print_r($messageType, true));
throw new \InvalidArgumentException($message);
}
@ -73,9 +74,10 @@ class ErrorLogHandler extends AbstractProcessingHandler
{
if (!$this->expandNewlines) {
error_log((string) $record['formatted'], $this->messageType);
return;
}
}
$lines = preg_split('{[\r\n]+}', (string) $record['formatted']);
foreach ($lines as $line) {
error_log($line, $this->messageType);

2
src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
View File

@ -21,7 +21,7 @@ interface ActivationStrategyInterface
/**
* Returns whether the given record activates the handler.
*
* @param array $record
* @param array $record
* @return bool
*/
public function isHandlerActivated(array $record);

1
src/Monolog/Handler/FirePHPHandler.php
View File

@ -21,7 +21,6 @@ use Monolog\Formatter\FormatterInterface;
*/
class FirePHPHandler extends AbstractProcessingHandler
{
use WebRequestRecognizerTrait;
/**

6
src/Monolog/Handler/HandlerInterface.php
View File

@ -43,9 +43,9 @@ interface HandlerInterface
* Unless the bubbling is interrupted (by returning true), the Logger class will keep on
* calling further handlers in the stack with a given log record.
*
* @param array $record The record to handle
* @return bool true means that this handler handled the record, and that bubbling is not permitted.
* false means the record was either not processed or that this handler allows bubbling.
* @param array $record The record to handle
* @return bool true means that this handler handled the record, and that bubbling is not permitted.
* false means the record was either not processed or that this handler allows bubbling.
*/
public function handle(array $record): bool;

6
src/Monolog/Handler/InsightOpsHandler.php
View File

@ -9,11 +9,11 @@
* file that was distributed with this source code.
*/
namespace Monolog\Handler;
namespace Monolog\Handler;
use Monolog\Logger;
use Monolog\Logger;
/**
/**
* Inspired on LogEntriesHandler.
*
* @author Robert Kaufmann III <rok3@rok3.me>

10
src/Monolog/Handler/RollbarHandler.php
View File

@ -19,7 +19,7 @@ use Monolog\Logger;
* Sends errors to Rollbar
*
* If the context data contains a `payload` key, that is used as an array
* of payload options to RollbarLogger's log method.
* of payload options to RollbarLogger's log method.
*
* Rollbar's context info will contain the context + extra keys from the log record
* merged, and then on top of that a few keys:
@ -59,9 +59,9 @@ class RollbarHandler extends AbstractProcessingHandler
protected $initialized = false;
/**
* @param RollbarLogger $rollbarLogger RollbarLogger object constructed with valid token
* @param 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 RollbarLogger $rollbarLogger RollbarLogger object constructed with valid token
* @param 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
*/
public function __construct(RollbarLogger $rollbarLogger, $level = Logger::ERROR, $bubble = true)
{
@ -96,7 +96,7 @@ class RollbarHandler extends AbstractProcessingHandler
} else {
$toLog = $record['message'];
}
$this->rollbarLogger->log($context['level'], $toLog, $context);
$this->hasRecords = true;

2
src/Monolog/Handler/SlackWebhookHandler.php
View File

@ -90,7 +90,7 @@ class SlackWebhookHandler extends AbstractProcessingHandler
CURLOPT_POST => true,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_HTTPHEADER => array('Content-type: application/json'),
CURLOPT_POSTFIELDS => $postString
CURLOPT_POSTFIELDS => $postString,
);
if (defined('CURLOPT_SAFE_UPLOAD')) {
$options[CURLOPT_SAFE_UPLOAD] = true;

1
src/Monolog/Handler/SqsHandler.php
View File

@ -21,7 +21,6 @@ use Monolog\Logger;
*/
class SqsHandler extends AbstractProcessingHandler
{
/** 256 KB in bytes - maximum message size in SQS */
const MAX_MESSAGE_SIZE = 262144;
/** 100 KB in bytes - head message size for new error log */

1
src/Monolog/Handler/StreamHandler.php
View File

@ -106,6 +106,7 @@ class StreamHandler extends AbstractProcessingHandler
restore_error_handler();
if (!is_resource($this->stream)) {
$this->stream = null;
throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened: '.$this->errorMessage, $this->url));
}
}

1
src/Monolog/Handler/TestHandler.php
View File

@ -101,6 +101,7 @@ class TestHandler extends AbstractProcessingHandler
if (isset($record['context']) && $rec['context'] !== $record['context']) {
return false;
}
return true;
}, $level);
}

10
src/Monolog/Handler/WebRequestRecognizerTrait.php
View File

@ -1,10 +1,18 @@
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
*
* (c) Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Monolog\Handler;
trait WebRequestRecognizerTrait
{
/**
* Checks if PHP's serving a web request
* @return bool

8
src/Monolog/Logger.php
View File

@ -276,10 +276,10 @@ class Logger implements LoggerInterface
/**
* Adds a log record.
*
* @param int $level The logging level
* @param string $message The log message
* @param array $context The log context
* @return bool Whether the record has been processed
* @param int $level The logging level
* @param string $message The log message
* @param array $context The log context
* @return bool Whether the record has been processed
*/
public function addRecord(int $level, string $message, array $context = []): bool
{

2
src/Monolog/Processor/HostnameProcessor.php
View File

@ -11,8 +11,6 @@
namespace Monolog\Processor;
use Monolog\Logger;
/**
* Injects value of gethostname in all records
*/

2
src/Monolog/Processor/IntrospectionProcessor.php
View File

@ -65,11 +65,13 @@ class IntrospectionProcessor
foreach ($this->skipClassesPartials as $part) {
if (strpos($trace[$i]['class'], $part) !== false) {
$i++;
continue 2;
}
}
} elseif (in_array($trace[$i]['function'], $this->skipFunctions)) {
$i++;
continue;
}

4
src/Monolog/Processor/PsrLogMessageProcessor.php
View File

@ -28,8 +28,8 @@ class PsrLogMessageProcessor
private $removeUsedContextFields;
/**
* @param string $dateFormat The format of the timestamp: one supported by DateTime::format
* @param bool $removeUsedContextFields If set to true the fields interpolated into message gets unset
* @param string $dateFormat The format of the timestamp: one supported by DateTime::format
* @param bool $removeUsedContextFields If set to true the fields interpolated into message gets unset
*/
public function __construct(string $dateFormat = null, bool $removeUsedContextFields = false)
{

2
tests/Monolog/Formatter/GelfMessageFormatterTest.php
View File

@ -234,7 +234,7 @@ class GelfMessageFormatterTest extends \PHPUnit\Framework\TestCase
'context' => array('exception' => str_repeat(' ', 32767 * 2)),
'datetime' => new \DateTime("@0"),
'extra' => array('key' => str_repeat(' ', 32767 * 2)),
'message' => 'log'
'message' => 'log',
);
$message = $formatter->format($record);
$messageArray = $message->toArray();

1
tests/Monolog/Handler/ElasticSearchHandlerTest.php
View File

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

5
tests/Monolog/Handler/FilterHandlerTest.php
View File

@ -146,7 +146,10 @@ class FilterHandlerTest extends TestCase
$handler = new FilterHandler(
function ($record, $handler) use ($test) {
return $test;
}, Logger::INFO, Logger::NOTICE, false
},
Logger::INFO,
Logger::NOTICE,
false
);
$handler->handle($this->getRecord(Logger::DEBUG));
$handler->handle($this->getRecord(Logger::INFO));

11
tests/Monolog/Handler/InsightOpsHandlerTest.php
View File

@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
namespace Monolog\Handler;
use Monolog\Test\TestCase;
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Logger;
/**
/**
* @author Robert Kaufmann III <rok3@rok3.me>
* @author Gabriel Machado <gabriel.ms1@hotmail.com>
*/
@ -62,7 +62,6 @@ class InsightOpsHandlerTest extends TestCase
->setConstructorArgs($args)
->getMock();
$reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue($this->handler, 'localhost:1234');

4
tests/Monolog/Handler/RollbarHandlerTest.php
View File

@ -59,9 +59,9 @@ class RollbarHandlerTest extends TestCase
{
$config = array(
'access_token' => 'ad865e76e7fb496fab096ac07b1dbabb',
'environment' => 'test'
'environment' => 'test',
);
$this->rollbarLogger = $this->getMockBuilder(RollbarLogger::class)
->setConstructorArgs(array($config))
->setMethods(array('log'))

5
tests/Monolog/Handler/RotatingFileHandlerTest.php
View File

@ -102,10 +102,10 @@ class RotatingFileHandlerTest extends TestCase
$dayCallback = function ($ago) use ($now) {
return $now + 86400 * $ago;
};
$monthCallback = function($ago) {
$monthCallback = function ($ago) {
return gmmktime(0, 0, 0, (int) (date('n') + $ago), 1, (int) date('Y'));
};
$yearCallback = function($ago) {
$yearCallback = function ($ago) {
return gmmktime(0, 0, 0, 1, 1, (int) (date('Y') + $ago));
};
@ -216,7 +216,6 @@ class RotatingFileHandlerTest extends TestCase
public function rotationWhenSimilarFilesExistTests()
{
return array(
'Rotation is triggered when the file of the current day is not present but similar exists'
=> array(RotatingFileHandler::FILE_PER_DAY),

12
tests/Monolog/Handler/TestHandlerTest.php
View File

@ -54,7 +54,8 @@ class TestHandlerTest extends TestCase
$this->assertEquals([$record], $records);
}
public function testHandlerAssertEmptyContext() {
public function testHandlerAssertEmptyContext()
{
$handler = new TestHandler;
$record = $this->getRecord(Logger::WARNING, 'test', []);
$this->assertFalse($handler->hasWarning([
@ -71,18 +72,19 @@ class TestHandlerTest extends TestCase
$this->assertFalse($handler->hasWarning([
'message' => 'test',
'context' => [
'foo' => 'bar'
'foo' => 'bar',
],
]));
}
public function testHandlerAssertNonEmptyContext() {
public function testHandlerAssertNonEmptyContext()
{
$handler = new TestHandler;
$record = $this->getRecord(Logger::WARNING, 'test', ['foo' => 'bar']);
$this->assertFalse($handler->hasWarning([
'message' => 'test',
'context' => [
'foo' => 'bar'
'foo' => 'bar',
],
]));
@ -91,7 +93,7 @@ class TestHandlerTest extends TestCase
$this->assertTrue($handler->hasWarning([
'message' => 'test',
'context' => [
'foo' => 'bar'
'foo' => 'bar',
],
]));
$this->assertFalse($handler->hasWarning([