Adding an explicit FriendicaProcessor

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

diff --git a/src/Util/XML.php b/src/Util/XML.php
index 6ba6d14f140ece90a8f4c0b6ae8408e6e98aceef..d56b2311f3b746d8aac24fffcae7894c45461977 100644 (file)
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -36,7 +36,7 @@ class XML
                                        $root = new SimpleXMLElement("<".$key."/>");
                                        self::fromArray($value, $root, $remove_header, $namespaces, false);
                                } else {
-                                       $root = new SimpleXMLElement("<".$key.">".self::xmlify($value)."</".$key.">");
+                                       $root = new SimpleXMLElement("<".$key.">".self::escape($value)."</".$key.">");
                                }
 
                                $dom = dom_import_simplexml($root)->ownerDocument;
@@ -104,7 +104,7 @@ class XML
                        }
 
                        if (!is_array($value)) {
-                               $element = $xml->addChild($key, self::xmlify($value), $namespace);
+                               $element = $xml->addChild($key, self::escape($value), $namespace);
                        } elseif (is_array($value)) {
                                $element = $xml->addChild($key, null, $namespace);
                                self::fromArray($value, $element, $remove_header, $namespaces, false);
@@ -123,7 +123,7 @@ class XML
        public static function copy(&$source, &$target, $elementname)
        {
                if (count($source->children()) == 0) {
-                       $target->addChild($elementname, self::xmlify($source));
+                       $target->addChild($elementname, self::escape($source));
                } else {
                        $child = $target->addChild($elementname);
                        foreach ($source->children() as $childfield => $childentry) {
@@ -144,11 +144,11 @@ class XML
         */
        public static function createElement($doc, $element, $value = "", $attributes = [])
        {
-               $element = $doc->createElement($element, self::xmlify($value));
+               $element = $doc->createElement($element, self::escape($value));
 
                foreach ($attributes as $key => $value) {
                        $attribute = $doc->createAttribute($key);
-                       $attribute->value = self::xmlify($value);
+                       $attribute->value = self::escape($value);
                        $element->appendChild($attribute);
                }
                return $element;
@@ -230,17 +230,18 @@ class XML
         * (namespaces, lowercase tags, get_attribute default changed, more...)
         *
         * Examples: $array =  Xml::toArray(file_get_contents('feed.xml'));
-        *              $array =  Xml::toArray(file_get_contents('feed.xml', true, 1, 'attribute'));
+        *        $array =  Xml::toArray(file_get_contents('feed.xml', true, 1, 'attribute'));
         *
-        * @param object  $contents       The XML text
-        * @param boolean $namespaces     True or false include namespace information
-        *                                    in the returned array as array elements.
-        * @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.
+        * @param object  $contents         The XML text
+        * @param boolean $namespaces       True or false include namespace information
+        *                                  in the returned array as array elements.
+        * @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.
         *
         * @return array The parsed XML in an array form. Use print_r() to see the resulting array structure.
+        * @throws \Exception
         */
        public static function toArray($contents, $namespaces = true, $get_attributes = 1, $priority = 'attribute')
        {
@@ -286,9 +287,6 @@ class XML
 
                //Initializations
                $xml_array = [];
-               $parents = [];
-               $opened_tags = [];
-               $arr = [];
 
                $current = &$xml_array; // Reference
 
@@ -468,7 +466,7 @@ class XML
         * @param string $str
         * @return string Escaped text.
         */
-       public static function xmlify($str)
+       public static function escape($str)
        {
                $buffer = htmlspecialchars($str, ENT_QUOTES, "UTF-8");
                $buffer = trim($buffer);
@@ -477,28 +475,28 @@ class XML
        }
 
        /**
-        * undo an xmlify
+        * undo an escape
         * @param string $s xml escaped text
         * @return string unescaped text
         */
-       public static function unxmlify($s)
+       public static function unescape($s)
        {
                $ret = htmlspecialchars_decode($s, ENT_QUOTES);
                return $ret;
        }
 
        /**
-        * apply xmlify() to all values of array $val, recursively
+        * apply escape() to all values of array $val, recursively
         * @param array $val
         * @return array
         */
-       public static function arrayXmlify($val)
+       public static function arrayEscape($val)
        {
                if (is_bool($val)) {
                        return $val?"true":"false";
                } elseif (is_array($val)) {
-                       return array_map('XML::arrayXmlify', $val);
+                       return array_map('XML::arrayEscape', $val);
                }
-               return self::xmlify((string) $val);
+               return self::escape((string) $val);
        }
 }