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

More type hints

Browse Source
This commit is contained in:
Jordi Boggiano
2016-05-26 17:40:25 +01:00
parent 76a91c6722
commit 6f26801be6
3 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Monolog/Formatter/JsonFormatter.php
View File

@@ -163,17 +163,12 @@ class JsonFormatter extends NormalizerFormatter
* Normalizes given exception with or without its own stack trace based on
* `includeStacktraces` property.
*
* @param Exception|Throwable $e
* @param Throwable $e
*
* @return array
*/
protected function normalizeException($e)
protected function normalizeException(\Throwable $e)
{
// TODO 2.0 only check for Throwable
if (!$e instanceof Exception && !$e instanceof \Throwable) {
throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.get_class($e));
}
$data = array(
'class' => get_class($e),
'message' => $e->getMessage(),

7
src/Monolog/Formatter/LineFormatter.php
View File

@@ -119,13 +119,8 @@ class LineFormatter extends NormalizerFormatter
return $this->replaceNewlines($this->convertToString($value));
}
protected function normalizeException($e)
protected function normalizeException(\Throwable $e)
{
// TODO 2.0 only check for Throwable
if (!$e instanceof \Exception && !$e instanceof \Throwable) {
throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.get_class($e));
}
$previousText = '';
if ($previous = $e->getPrevious()) {
do {

16
src/Monolog/Formatter/NormalizerFormatter.php
View File

@@ -28,7 +28,7 @@ class NormalizerFormatter implements FormatterInterface
/**
* @param string $dateFormat The format of the timestamp: one supported by DateTime::format
*/
public function __construct($dateFormat = null)
public function __construct(string $dateFormat = null)
{
$this->dateFormat = $dateFormat;
if (!function_exists('json_encode')) {
@@ -116,12 +116,8 @@ class NormalizerFormatter implements FormatterInterface
return '[unknown('.gettype($data).')]';
}
protected function normalizeException($e)
protected function normalizeException(Throwable $e)
{
if (!$e instanceof Throwable) {
throw new \InvalidArgumentException('Throwable expected, got '.gettype($e).' / '.get_class($e));
}
$data = array(
'class' => get_class($e),
'message' => $e->getMessage(),
@@ -155,7 +151,7 @@ class NormalizerFormatter implements FormatterInterface
* @param mixed $data
* @param bool $ignoreErrors
* @throws \RuntimeException if encoding fails and errors are not ignored
* @return string
* @return string|bool
*/
protected function toJson($data, $ignoreErrors = false)
{
@@ -175,7 +171,7 @@ class NormalizerFormatter implements FormatterInterface
/**
* @param mixed $data
* @return string JSON encoded data or null on failure
* @return string|bool JSON encoded data or false on failure
*/
private function jsonEncode($data)
{
@@ -195,7 +191,7 @@ class NormalizerFormatter implements FormatterInterface
* @throws \RuntimeException if failure can't be corrected
* @return string JSON encoded data after error correction
*/
private function handleJsonError($code, $data)
private function handleJsonError(int $code, $data): string
{
if ($code !== JSON_ERROR_UTF8) {
$this->throwEncodeError($code, $data);
@@ -225,7 +221,7 @@ class NormalizerFormatter implements FormatterInterface
* @param mixed $data data that was meant to be encoded
* @throws \RuntimeException
*/
private function throwEncodeError($code, $data)
private function throwEncodeError(int $code, $data)
{
switch ($code) {
case JSON_ERROR_DEPTH: