mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-23 01:26:11 +02:00
Code Issues Releases Wiki Activity

Move to strict mode and fix tests

Browse Source
This commit is contained in:
Jordi Boggiano
2016-05-27 13:44:00 +01:00
parent 788902b320
commit 21dde4dedb
170 changed files with 239 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@@ -83,7 +83,7 @@ abstract class AbstractSyslogHandler extends AbstractProcessingHandler
}
// convert textual description of facility to syslog constant
if (array_key_exists(strtolower($facility), $this->facilities)) {
if (is_string($facility) && array_key_exists(strtolower($facility), $this->facilities)) {
$facility = $this->facilities[strtolower($facility)];
} elseif (!in_array($facility, array_values($this->facilities), true)) {
throw new \UnexpectedValueException('Unknown facility value "'.$facility.'" given');

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@@ -58,7 +58,7 @@ class CouchDBHandler extends AbstractProcessingHandler
],
]);
if (false === @file_get_contents($url, null, $context)) {
if (false === @file_get_contents($url, false, $context)) {
throw new \RuntimeException(sprintf('Could not connect to %s', $url));
}
}

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

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

2
src/Monolog/Handler/Curl/Util.php
View File

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

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

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@@ -144,7 +144,7 @@ class DeduplicationHandler extends BufferHandler
while (!feof($handle)) {
$log = fgets($handle);
if (substr($log, 0, 10) >= $timestampValidity) {
if ($log && substr($log, 0, 10) >= $timestampValidity) {
$validLogs[] = $log;
}
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@@ -46,7 +46,7 @@ abstract class MailHandler extends AbstractProcessingHandler
* @param string $content formatted email body to be sent
* @param array $records the array of log records that formed this content
*/
abstract protected function send($content, array $records);
abstract protected function send(string $content, array $records);
/**
* {@inheritdoc}

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@@ -115,7 +115,7 @@ class NativeMailerHandler extends MailHandler
/**
* {@inheritdoc}
*/
protected function send($content, array $records)
protected function send(string $content, array $records)
{
$contentType = $this->getContentType() ?: ($this->isHtmlBody($content) ? 'text/html' : 'text/plain');

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@@ -134,7 +134,8 @@ class RotatingFileHandler extends StreamHandler
if (is_writable($file)) {
// suppress errors here as unlink() might fail if two processes
// are cleaning up/rotating at the same time
set_error_handler(function ($errno, $errstr, $errfile, $errline) {});
set_error_handler(function ($errno, $errstr, $errfile, $errline) {
});
unlink($file);
restore_error_handler();
}

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

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

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

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

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

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@@ -92,7 +92,7 @@ class SlackHandler extends SocketHandler
$this->token = $token;
$this->channel = $channel;
$this->username = $username;
$this->iconEmoji = trim($iconEmoji, ':');
$this->iconEmoji = is_string($iconEmoji) ? trim($iconEmoji, ':') : null;
$this->useAttachment = $useAttachment;
$this->useShortAttachment = $useShortAttachment;
$this->includeContextAndExtra = $includeContextAndExtra;

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

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

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

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

15
src/Monolog/Handler/SwiftMailerHandler.php
View File

@@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
/*
* This file is part of the Monolog package.
@@ -13,6 +13,7 @@ namespace Monolog\Handler;
use Monolog\Logger;
use Monolog\Formatter\LineFormatter;
use Swift_Message;
/**
* SwiftMailerHandler uses Swift_Mailer to send the emails
@@ -26,7 +27,7 @@ class SwiftMailerHandler extends MailHandler
/**
* @param \Swift_Mailer $mailer The mailer to use
* @param callable|\Swift_Message $message An example message for real messages, only the body will be replaced
* @param callable|Swift_Message $message An example message for real messages, only the body will be replaced
* @param int $level The minimum logging level at which this handler will be triggered
* @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
*/
@@ -41,7 +42,7 @@ class SwiftMailerHandler extends MailHandler
/**
* {@inheritdoc}
*/
protected function send($content, array $records)
protected function send(string $content, array $records)
{
$this->mailer->send($this->buildMessage($content, $records));
}
@@ -51,19 +52,19 @@ class SwiftMailerHandler extends MailHandler
*
* @param string $content formatted email body to be sent
* @param array $records Log records that formed the content
* @return \Swift_Message
* @return Swift_Message
*/
protected function buildMessage($content, array $records)
protected function buildMessage(string $content, array $records): Swift_Message
{
$message = null;
if ($this->messageTemplate instanceof \Swift_Message) {
if ($this->messageTemplate instanceof Swift_Message) {
$message = clone $this->messageTemplate;
$message->generateId();
} elseif (is_callable($this->messageTemplate)) {
$message = call_user_func($this->messageTemplate, $content, $records);
}
if (!$message instanceof \Swift_Message) {
if (!$message instanceof Swift_Message) {
throw new \InvalidArgumentException('Could not resolve message as instance of Swift_Message or a callable returning it');
}

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

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

2
src/Monolog/Handler/SyslogUdp/UdpSocket.php
View File

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

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

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

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

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

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

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

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

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