From 6cc339031abfebabfc4326ecc1ae0fb1e69fa1f6 Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Sun, 4 Nov 2018 08:21:37 -0500
Subject: [PATCH] Rename functions

rename functions
---
 src/Util/XML.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Util/XML.php b/src/Util/XML.php
index 6ba6d14f14..c115e4d0de 100644
--- 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;
@@ -468,7 +468,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 +477,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);
 	}
 }
-- 
2.39.2