mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 13:16:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-03-01 18:04:51 +00:00
parent 3d30ba5ecc e19b764b5c
commit 3d87f3ce4f
5 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
.php_cs
View File

@@ -9,7 +9,7 @@ For the full copyright and license information, please view the LICENSE
file that was distributed with this source code. file that was distributed with this source code.
EOF; EOF;
$finder = Symfony\CS\Finder\DefaultFinder::create() $finder = Symfony\CS\Finder::create()
->files() ->files()
->name('*.php') ->name('*.php')
->exclude('Fixtures') ->exclude('Fixtures')
@@ -17,23 +17,28 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
->in(__DIR__.'/tests') ->in(__DIR__.'/tests')
; ;
return Symfony\CS\Config\Config::create() return Symfony\CS\Config::create()
->setUsingCache(true) ->setUsingCache(true)
//->setUsingLinter(false)
->setRiskyAllowed(true) ->setRiskyAllowed(true)
->setRules(array( ->setRules(array(
'@PSR2' => true, '@PSR2' => true,
'duplicate_semicolon' => true, 'binary_operator_spaces' => true,
'extra_empty_lines' => true, 'blank_line_before_return' => true,
'header_comment' => array('header' => $header), 'header_comment' => array('header' => $header),
'include' => true, 'include' => true,
'long_array_syntax' => true, 'long_array_syntax' => true,
'method_separation' => true, 'method_separation' => true,
'multiline_array_trailing_comma' => true,
'namespace_no_leading_whitespace' => true,
'no_blank_lines_after_class_opening' => true, 'no_blank_lines_after_class_opening' => true,
'no_empty_lines_after_phpdocs' => true, 'no_blank_lines_after_phpdoc' => true,
'object_operator' => true, 'no_blank_lines_between_uses' => true,
'operators_spaces' => true, 'no_duplicate_semicolons' => true,
'no_extra_consecutive_blank_lines' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_unused_imports' => true,
'object_operator_without_whitespace' => true,
'phpdoc_align' => true, 'phpdoc_align' => true,
'phpdoc_indent' => true, 'phpdoc_indent' => true,
'phpdoc_no_access' => true, 'phpdoc_no_access' => true,
@@ -43,15 +48,11 @@ return Symfony\CS\Config\Config::create()
'phpdoc_trim' => true, 'phpdoc_trim' => true,
'phpdoc_type_to_var' => true, 'phpdoc_type_to_var' => true,
'psr0' => true, 'psr0' => true,
'return' => true,
'remove_leading_slash_use' => true,
'remove_lines_between_uses' => true,
'single_array_no_trailing_comma' => true,
'single_blank_line_before_namespace' => true, 'single_blank_line_before_namespace' => true,
'spaces_cast' => true, 'spaces_cast' => true,
'standardize_not_equal' => true, 'standardize_not_equals' => true,
'ternary_spaces' => true, 'ternary_operator_spaces' => true,
'unused_use' => true, 'trailing_comma_in_multiline_array' => true,
'whitespacy_lines' => true, 'whitespacy_lines' => true,
)) ))
->finder($finder) ->finder($finder)

15
CHANGELOG.mdown
View File

@@ -1,3 +1,18 @@
### 1.18.0 (2016-03-01)
* Added optional reduction of timestamp precision via `Logger->useMicrosecondTimestamps(false)`, disabling it gets you a bit of performance boost but reduces the precision to the second instead of microsecond
* Added possibility to skip some extra stack frames in IntrospectionProcessor if you have some library wrapping Monolog that is always adding frames
* Added `Logger->withName` to clone a logger (keeping all handlers) with a new name
* Added FluentdFormatter for the Fluentd unix socket protocol
* Added HandlerWrapper base class to ease the creation of handler wrappers, just extend it and override as needed
* Added support for replacing context sub-keys using `%context.*%` in LineFormatter
* Added support for `payload` context value in RollbarHandler
* Added setRelease to RavenHandler to describe the application version, sent with every log
* Added support for `fingerprint` context value in RavenHandler
* Fixed JSON encoding errors that would gobble up the whole log record, we now handle those more gracefully by dropping chars as needed
* Fixed write timeouts in SocketHandler and derivatives, set to 10sec by default, lower it with `setWritingTimeout()`
* Fixed PHP7 compatibility with regard to Exception/Throwable handling in a few places
### 1.17.2 (2015-10-14) ### 1.17.2 (2015-10-14)
* Fixed ErrorHandler compatibility with non-Monolog PSR-3 loggers * Fixed ErrorHandler compatibility with non-Monolog PSR-3 loggers

5
src/Monolog/Handler/AmqpHandler.php
View File

@@ -84,6 +84,7 @@ class AmqpHandler extends AbstractProcessingHandler
{ {
if ($this->exchange instanceof AMQPExchange) { if ($this->exchange instanceof AMQPExchange) {
parent::handleBatch($records); parent::handleBatch($records);
return; return;
} }
@@ -108,7 +109,7 @@ class AmqpHandler extends AbstractProcessingHandler
/** /**
* Gets the routing key for the AMQP exchange * Gets the routing key for the AMQP exchange
* *
* @param array $record * @param array $record
* @return string * @return string
*/ */
private function getRoutingKey(array $record) private function getRoutingKey(array $record)
@@ -124,7 +125,7 @@ class AmqpHandler extends AbstractProcessingHandler
} }
/** /**
* @param string $data * @param string $data
* @return AMQPMessage * @return AMQPMessage
*/ */
private function createAmqpMessage($data) private function createAmqpMessage($data)

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

@@ -66,7 +66,7 @@ class BrowserConsoleHandler extends AbstractProcessingHandler
if (count(self::$records)) { if (count(self::$records)) {
if ($format === 'html') { if ($format === 'html') {
self::writeOutput('<script>' , self::generateScript() , '</script>'); self::writeOutput('<script>', self::generateScript(), '</script>');
} elseif ($format === 'js') { } elseif ($format === 'js') {
self::writeOutput(self::generateScript()); self::writeOutput(self::generateScript());
} }

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

@@ -18,50 +18,50 @@ namespace Monolog\Handler;
* *
* @author Jordi Boggiano <j.boggiano@seld.be> * @author Jordi Boggiano <j.boggiano@seld.be>
* *
* @method boolean hasEmergency($record) * @method bool hasEmergency($record)
* @method boolean hasAlert($record) * @method bool hasAlert($record)
* @method boolean hasCritical($record) * @method bool hasCritical($record)
* @method boolean hasError($record) * @method bool hasError($record)
* @method boolean hasWarning($record) * @method bool hasWarning($record)
* @method boolean hasNotice($record) * @method bool hasNotice($record)
* @method boolean hasInfo($record) * @method bool hasInfo($record)
* @method boolean hasDebug($record) * @method bool hasDebug($record)
* *
* @method boolean hasEmergencyRecords() * @method bool hasEmergencyRecords()
* @method boolean hasAlertRecords() * @method bool hasAlertRecords()
* @method boolean hasCriticalRecords() * @method bool hasCriticalRecords()
* @method boolean hasErrorRecords() * @method bool hasErrorRecords()
* @method boolean hasWarningRecords() * @method bool hasWarningRecords()
* @method boolean hasNoticeRecords() * @method bool hasNoticeRecords()
* @method boolean hasInfoRecords() * @method bool hasInfoRecords()
* @method boolean hasDebugRecords() * @method bool hasDebugRecords()
* *
* @method boolean hasEmergencyThatContains($message) * @method bool hasEmergencyThatContains($message)
* @method boolean hasAlertThatContains($message) * @method bool hasAlertThatContains($message)
* @method boolean hasCriticalThatContains($message) * @method bool hasCriticalThatContains($message)
* @method boolean hasErrorThatContains($message) * @method bool hasErrorThatContains($message)
* @method boolean hasWarningThatContains($message) * @method bool hasWarningThatContains($message)
* @method boolean hasNoticeThatContains($message) * @method bool hasNoticeThatContains($message)
* @method boolean hasInfoThatContains($message) * @method bool hasInfoThatContains($message)
* @method boolean hasDebugThatContains($message) * @method bool hasDebugThatContains($message)
* *
* @method boolean hasEmergencyThatMatches($message) * @method bool hasEmergencyThatMatches($message)
* @method boolean hasAlertThatMatches($message) * @method bool hasAlertThatMatches($message)
* @method boolean hasCriticalThatMatches($message) * @method bool hasCriticalThatMatches($message)
* @method boolean hasErrorThatMatches($message) * @method bool hasErrorThatMatches($message)
* @method boolean hasWarningThatMatches($message) * @method bool hasWarningThatMatches($message)
* @method boolean hasNoticeThatMatches($message) * @method bool hasNoticeThatMatches($message)
* @method boolean hasInfoThatMatches($message) * @method bool hasInfoThatMatches($message)
* @method boolean hasDebugThatMatches($message) * @method bool hasDebugThatMatches($message)
* *
* @method boolean hasEmergencyThatPasses($message) * @method bool hasEmergencyThatPasses($message)
* @method boolean hasAlertThatPasses($message) * @method bool hasAlertThatPasses($message)
* @method boolean hasCriticalThatPasses($message) * @method bool hasCriticalThatPasses($message)
* @method boolean hasErrorThatPasses($message) * @method bool hasErrorThatPasses($message)
* @method boolean hasWarningThatPasses($message) * @method bool hasWarningThatPasses($message)
* @method boolean hasNoticeThatPasses($message) * @method bool hasNoticeThatPasses($message)
* @method boolean hasInfoThatPasses($message) * @method bool hasInfoThatPasses($message)
* @method boolean hasDebugThatPasses($message) * @method bool hasDebugThatPasses($message)
*/ */
class TestHandler extends AbstractProcessingHandler class TestHandler extends AbstractProcessingHandler
{ {