X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FXML.php;h=9aba38910d6a7a0020e743d8f95ba30ec24690b2;hb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;hp=4dd6d84ecbefea7d50a2c24e21a8b934402ddbbd;hpb=8adc761da0e6012aa0176047812df15adb15c33a;p=friendica.git diff --git a/src/Util/XML.php b/src/Util/XML.php index 4dd6d84ecb..9aba38910d 100644 --- a/src/Util/XML.php +++ b/src/Util/XML.php @@ -1,21 +1,38 @@ . + * */ + namespace Friendica\Util; -use Friendica\Core\Logger; use DOMXPath; +use Friendica\Core\Logger; use Friendica\Core\System; use SimpleXMLElement; /** - * @brief This class contain methods to work with XML data + * This class contain methods to work with XML data */ class XML { /** - * @brief Creates an XML structure out of a given array + * Creates an XML structure out of a given array * * @param array $array The array of the XML structure that will be generated * @param object $xml The createdXML will be returned by reference @@ -114,7 +131,7 @@ class XML } /** - * @brief Copies an XML object + * Copies an XML object * * @param object $source The XML source * @param object $target The XML target @@ -134,7 +151,7 @@ class XML } /** - * @brief Create an XML element + * Create an XML element * * @param \DOMDocument $doc XML root * @param string $element XML element name @@ -156,7 +173,7 @@ class XML } /** - * @brief Create an XML and append it to the parent object + * Create an XML and append it to the parent object * * @param \DOMDocument $doc XML root * @param object $parent parent object @@ -172,7 +189,7 @@ class XML } /** - * @brief Convert an XML document to a normalised, case-corrected array + * Convert an XML document to a normalised, case-corrected array * used by webfinger * * @param object $xml_element The XML document @@ -223,7 +240,7 @@ class XML } /** - * @brief Convert the given XML text to an array in the XML structure. + * Convert the given XML text to an array in the XML structure. * * Xml::toArray() will convert the given XML text to an array in the XML structure. * Link: http://www.bin-co.com/php/scripts/xml2array/ @@ -401,7 +418,7 @@ class XML } /** - * @brief Delete a node in a XML object + * Delete a node in a XML object * * @param \DOMDocument $doc XML document * @param string $node Node name @@ -465,12 +482,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; @@ -478,6 +496,7 @@ class XML /** * undo an escape + * * @param string $s xml escaped text * @return string unescaped text */ @@ -489,16 +508,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); } }