travis

[plcapi.git] / src / Helper / Charset.php

diff --git a/src/Helper/Charset.php b/src/Helper/Charset.php
index 4f1103b..2f41143 100644 (file)
--- a/src/Helper/Charset.php
+++ b/src/Helper/Charset.php
@@ -8,11 +8,10 @@ class Charset
 {
     // tables used for transcoding different charsets into us-ascii xml
     protected $xml_iso88591_Entities = array("in" => array(), "out" => array());
-    protected $xml_iso88591_utf8 = array("in" => array(), "out" => array());
 
     /// @todo add to iso table the characters from cp_1252 range, i.e. 128 to 159?
-    /// These will NOT be present in true ISO-8859-1, but will save the unwary
-    /// windows user from sending junk (though no luck when receiving them...)
+    /// These will NOT be present in true ISO-8859-1, but will save the unwary windows user from sending junk
+    /// (though no luck when receiving them...)
     /*
     protected $xml_cp1252_Entities = array('in' => array(), out' => array(
         '€', '?',        '‚', 'ƒ',
@@ -214,15 +213,15 @@ class Charset
 
             default:
                 $escapedData = '';
-                error_log('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
+                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
         }
 
         return $escapedData;
     }
 
     /**
-     * Checks if a given charset encoding is present in a list of encodings or
-     * if it is a valid subset of any encoding in the list.
+     * Checks if a given charset encoding is present in a list of encodings or if it is a valid subset of any encoding
+     * in the list.
      *
      * @param string $encoding charset to be tested
      * @param string|array $validList comma separated list of valid charsets (or array of charsets)
@@ -261,6 +260,8 @@ class Charset
      */
     public function getEntities($charset)
     {
+        //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
         switch ($charset)
         {
             case 'iso88591':