X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2FHelper%2FLogger.php;h=bee7b08f00b4283567451950533e3aa6bfd70938;hb=bbc2894aa9b1aefe8a1763837795aa8479fe5e45;hp=0194765ac3d5c11f6553ba165288366b97862709;hpb=20a65226a4dad0def0ed1b34ac37c0a539fb2495;p=plcapi.git

diff --git a/src/Helper/Logger.php b/src/Helper/Logger.php
index 0194765..bee7b08 100644
--- a/src/Helper/Logger.php
+++ b/src/Helper/Logger.php
@@ -1,22 +1,19 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: gg
- * Date: 12/04/2015
- * Time: 12:11
- */
 
 namespace PhpXmlRpc\Helper;
 
-
+/**
+ * @todo implement an interface
+ * @todo make constructor private to force users to go through `instance()` ?
+ */
 class Logger
 {
     protected static $instance = null;
 
     /**
-     * This class is singleton, so that later we can move to DI patterns.
+     * This class can be used as singleton, so that later we can move to DI patterns.
      *
-     * @return Charset
+     * @return Logger
      */
     public static function instance()
     {
@@ -35,10 +32,22 @@ class Logger
      * @param string $message
      * @param string $encoding
      */
-    public function debugMessage($message, $encoding=null)
+    public function debugMessage($message, $encoding = null)
     {
+        // US-ASCII is a warning for PHP and a fatal for HHVM
+        if ($encoding == 'US-ASCII') {
+            $encoding = 'UTF-8';
+        }
+
         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 {
@@ -51,4 +60,13 @@ class Logger
         // let the user see this now in case there's a time out later...
         flush();
     }
-}
\ No newline at end of file
+
+    /**
+     * Writes a message to the error log
+     * @param string $message
+     */
+    public function errorLog($message)
+    {
+        error_log($message);
+    }
+}