Changes:

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

diff --git a/src/Util/XML.php b/src/Util/XML.php
index 0cdf1f34ed2f48db15e2b12bb6a214cf38487132..58ba84c4a7fc42686bb1e3279d8d2fa76423ada7 100644 (file)
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,7 +26,6 @@ use DOMElement;
 use DOMNode;
 use DOMXPath;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use SimpleXMLElement;
 
 /**
@@ -118,7 +117,7 @@ class XML
                                                $namespace = null;
                                        }
 
-                                       $element->addAttribute($attr_key, $attr_value, $namespace);
+                                       $element->addAttribute($attr_key, $attr_value ?? '', $namespace);
                                }
 
                                continue;
@@ -259,7 +258,7 @@ class XML
         * @param integer $get_attributes   1 or 0. If this is 1 the function will get the attributes as well as the tag values -
         *                                  this results in a different array structure in the return value.
         * @param string  $priority         Can be 'tag' or 'attribute'. This will change the way the resulting
-        *                                  array sturcture. For 'tag', the tags are given more importance.
+        *                                  array structure. For 'tag', the tags are given more importance.
         *
         * @return array The parsed XML in an array form. Use print_r() to see the resulting array structure.
         * @throws \Exception
@@ -397,7 +396,7 @@ class XML
                                                }
                                                $repeated_tag_index[$tag . '_' . $level]++;
                                        } else { // If it is not an array...
-                                               $current[$tag] = [$current[$tag], $result]; //...Make it an array using using the existing value and the new value
+                                               $current[$tag] = [$current[$tag], $result]; //...Make it an array using the existing value and the new value
                                                $repeated_tag_index[$tag . '_' . $level] = 1;
                                                if ($priority == 'tag' and $get_attributes) {
                                                        if (isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
@@ -441,7 +440,7 @@ class XML
         * Parse XML string
         *
         * @param string  $s XML string to parse into object
-        * @param boolean $suppress_log Whether to supressing logging
+        * @param boolean $suppress_log Whether to suppressing logging
         * @return SimpleXMLElement|bool SimpleXMLElement or false on failure
         */
        public static function parseString(string $s, bool $suppress_log = false)
@@ -451,7 +450,7 @@ class XML
                $x = @simplexml_load_string($s);
                if (!$x) {
                        if (!$suppress_log) {
-                               Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
+                               Logger::error('Error(s) while parsing XML string.');
                                foreach (libxml_get_errors() as $err) {
                                        Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ':' . $err->column, 'message' => $err->message]);
                                }
@@ -536,7 +535,7 @@ class XML
         *
         * @param string $str
         * @return string Escaped text.
-        * @todo Move this generic method to Util\Strings and also rewrite all other findingd
+        * @todo Move this generic method to Util\Strings and also rewrite all other occurrences
         */
        public static function escape(string $str): string
        {
@@ -548,7 +547,7 @@ class XML
         *
         * @param string $s xml escaped text
         * @return string unescaped text
-        * @todo Move this generic method to Util\Strings and also rewrite all other findingd
+        * @todo Move this generic method to Util\Strings and also rewrite all other occurrences
         */
        public static function unescape(string $s): string
        {