mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-22 00:56:08 +02:00
Code Issues Releases Wiki Activity

Removed unnecessary php version checks after php dependency bump to 7.0

Browse Source
This commit is contained in:
Jeroen Thora
2015-12-20 15:53:48 +01:00
parent cb641a8a19
commit 8ceda1b62e
6 changed files with 8 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Monolog/Formatter/HtmlFormatter.php
View File

@@ -132,10 +132,7 @@ class HtmlFormatter extends NormalizerFormatter
}
$data = $this->normalize($data);
if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
}
return str_replace('\\/', '/', json_encode($data));
return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
}
}

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

@@ -141,11 +141,7 @@ class LineFormatter extends NormalizerFormatter
return (string) $data;
}
if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
return $this->toJson($data, true);
}
return str_replace('\\/', '/', @json_encode($data));
return $this->toJson($data, true);
}
protected function replaceNewlines($str)

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

@@ -168,11 +168,7 @@ class NormalizerFormatter implements FormatterInterface
*/
private function jsonEncode($data)
{
if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
}
return json_encode($data);
return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
}
/**