From: gggeek <giunta.gaetano@gmail.com>
Date: Sat, 20 Jan 2018 14:55:28 +0000 (+0000)
Subject: another attempt; make Logger friend to php 5.3
X-Git-Tag: 4.3.1~1
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=f385a25ad132dac71a6a495f1dee295ad0e72883

another attempt; make Logger friend to php 5.3
---

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 "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>";
             } 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.</value></member><member><name>postid</name><value>7414222</
         {
             $this->assertArrayHasKey($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);
             }
         }