Merge pull request #7208 from nupplaphil/bug/6916-filetag

[friendica.git] / src / Util / XML.php

diff --git a/src/Util/XML.php b/src/Util/XML.php
index ba146ec7b8172298180ca36ae82acd52f2d041f3..476ecb4b00e7f964325e647472afd8b6bcf345c6 100644 (file)
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -4,8 +4,9 @@
  */
 namespace Friendica\Util;
 
-use Friendica\Core\Logger;
 use DOMXPath;
+use Friendica\Core\Logger;
+use Friendica\Core\System;
 use SimpleXMLElement;
 
 /**
@@ -422,10 +423,11 @@ class XML
 
                $x = @simplexml_load_string($s);
                if (!$x) {
-                       Logger::log('libxml: parse: error: ' . $s, Logger::DATA);
+                       Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
                        foreach (libxml_get_errors() as $err) {
-                               Logger::log('libxml: parse: ' . $err->code." at ".$err->line.":".$err->column." : ".$err->message, Logger::DATA);
+                               Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]);
                        }
+                       Logger::debug('Erroring XML string', ['xml' => $s]);
                        libxml_clear_errors();
                }
                return $x;
@@ -463,12 +465,13 @@ class XML
 
        /**
         * escape text ($str) for XML transport
+        *
         * @param string $str
         * @return string Escaped text.
         */
        public static function escape($str)
        {
-               $buffer = htmlspecialchars($str, ENT_QUOTES, "UTF-8");
+               $buffer = htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
                $buffer = trim($buffer);
 
                return $buffer;
@@ -476,6 +479,7 @@ class XML
 
        /**
         * undo an escape
+        *
         * @param string $s xml escaped text
         * @return string unescaped text
         */
@@ -487,16 +491,18 @@ class XML
 
        /**
         * apply escape() to all values of array $val, recursively
+        *
         * @param array $val
-        * @return array
+        * @return array|string
         */
        public static function arrayEscape($val)
        {
                if (is_bool($val)) {
-                       return $val?"true":"false";
+                       return $val ? 'true' : 'false';
                } elseif (is_array($val)) {
                        return array_map('XML::arrayEscape', $val);
                }
+
                return self::escape((string) $val);
        }
 }