From f385a25ad132dac71a6a495f1dee295ad0e72883 Mon Sep 17 00:00:00 2001 From: gggeek Date: Sat, 20 Jan 2018 14:55:28 +0000 Subject: [PATCH] another attempt; make Logger friend to php 5.3 --- src/Helper/Logger.php | 9 ++++++++- tests/1ParsingBugsTest.php | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Helper/Logger.php b/src/Helper/Logger.php index 77e0e14..85353eb 100644 --- a/src/Helper/Logger.php +++ b/src/Helper/Logger.php @@ -36,7 +36,14 @@ class Logger } if (PHP_SAPI != 'cli') { - $flags = ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE; + $flags = ENT_COMPAT; + // avoid warnings on php < 5.4... + if (defined('ENT_HTML401')) { + $flags = $flags | ENT_HTML401; + } + if (defined('ENT_SUBSTITUTE')) { + $flags = $flags | ENT_SUBSTITUTE; + } if ($encoding != null) { print "
\n".htmlentities($message, $flags, $encoding)."\n
"; } else { diff --git a/tests/1ParsingBugsTest.php b/tests/1ParsingBugsTest.php index e4e9b5a..10b5acb 100644 --- a/tests/1ParsingBugsTest.php +++ b/tests/1ParsingBugsTest.php @@ -620,10 +620,10 @@ and there they were.postid7414222assertArrayHasKey($key, $out); $expected = $out[$key]; - if (gettype($expected['value']) == 'array') { + if (gettype($expected) == 'array') { $this->assertequals('array', gettype($val)); } else { - $this->assertequals($expected['value'], $val); + $this->assertequals($expected, $val); } } -- 2.43.0