From 5785a9ac4aab1511baf2a1547fc0ca8e89631c38 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 31 Aug 2015 10:26:07 +0100 Subject: [PATCH] Fix CS and php5.3 compat --- src/Monolog/Handler/Curl/Util.php | 6 ++---- src/Monolog/Handler/RollbarHandler.php | 2 +- src/Monolog/Processor/IntrospectionProcessor.php | 2 +- tests/Monolog/RegistryTest.php | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Monolog/Handler/Curl/Util.php b/src/Monolog/Handler/Curl/Util.php index d71f0c6f..adbe4f49 100644 --- a/src/Monolog/Handler/Curl/Util.php +++ b/src/Monolog/Handler/Curl/Util.php @@ -33,13 +33,11 @@ class Util { while ($retries--) { if (curl_exec($ch) === false) { - $curlErrno = curl_errno($ch); - + if (false === in_array($curlErrno, self::$retriableErrorCodes, true) || !$retries) { - $curlError = curl_error($ch); - + if ($closeAfterDone) { curl_close($ch); } diff --git a/src/Monolog/Handler/RollbarHandler.php b/src/Monolog/Handler/RollbarHandler.php index 9f9356a0..0ad618d9 100644 --- a/src/Monolog/Handler/RollbarHandler.php +++ b/src/Monolog/Handler/RollbarHandler.php @@ -58,7 +58,7 @@ class RollbarHandler extends AbstractProcessingHandler $exception = $context['exception']; unset($context['exception']); - $payload = []; + $payload = array(); if (isset($context['payload'])) { $payload = $context['payload']; unset($context['payload']); diff --git a/src/Monolog/Processor/IntrospectionProcessor.php b/src/Monolog/Processor/IntrospectionProcessor.php index cf608d54..8f553fe3 100644 --- a/src/Monolog/Processor/IntrospectionProcessor.php +++ b/src/Monolog/Processor/IntrospectionProcessor.php @@ -91,7 +91,7 @@ class IntrospectionProcessor return $record; } - private function isTraceClassOrSkippedFunction (array $trace, $index) + private function isTraceClassOrSkippedFunction(array $trace, $index) { if (!isset($trace[$index])) { return false; diff --git a/tests/Monolog/RegistryTest.php b/tests/Monolog/RegistryTest.php index 661b0658..15fdfbd2 100644 --- a/tests/Monolog/RegistryTest.php +++ b/tests/Monolog/RegistryTest.php @@ -130,7 +130,6 @@ class RegistryTest extends \PHPUnit_Framework_TestCase $log1 = new Logger('test1'); $log2 = new Logger('test2'); - Registry::addLogger($log1, 'log'); Registry::addLogger($log2, 'log', true);