Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 07:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use short form array syntax everywhere

Browse source 
- Add short form array syntax to po2php.php generation
This commit is contained in:
Hypolite Petovan 2018-01-15 08:05:12 -05:00
parent 77dfbaa0bf
commit e36f2bb1fb
212 changed files with 5160 additions and 5160 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Util/XML.php
View file

@ -23,7 +23,7 @@ class XML
*
* @return string The created XML
*/
public static function fromArray($array, &$xml, $remove_header = false, $namespaces = array(), $root = true)
public static function fromArray($array, &$xml, $remove_header = false, $namespaces = [], $root = true)
{
if ($root) {
foreach ($array as $key => $value) {
@ -140,7 +140,7 @@ class XML
*
* @return object XML element object
*/
public static function createElement($doc, $element, $value = "", $attributes = array())
public static function createElement($doc, $element, $value = "", $attributes = [])
{
$element = $doc->createElement($element, xmlify($value));
@ -162,7 +162,7 @@ class XML
* @param array $attributes array containing the attributes
* @return void
*/
public static function addElement($doc, $parent, $element, $value = "", $attributes = array())
public static function addElement($doc, $parent, $element, $value = "", $attributes = [])
{
$element = self::createElement($doc, $element, $value, $attributes);
$parent->appendChild($element);
@ -194,7 +194,7 @@ class XML
}
if (is_array($xml_element)) {
$result_array = array();
$result_array = [];
if (count($xml_element) <= 0) {
return (trim(strval($xml_element_copy)));
}
@ -207,9 +207,9 @@ class XML
if ($recursion_depth == 0) {
$temp_array = $result_array;
$result_array = array(
$result_array = [
strtolower($xml_element_copy->getName()) => $temp_array,
);
];
}
return ($result_array);
@ -242,12 +242,12 @@ class XML
public static function toArray($contents, $namespaces = true, $get_attributes = 1, $priority = 'attribute')
{
if (!$contents) {
return array();
return [];
}
if (!function_exists('xml_parser_create')) {
logger('Xml::toArray: parser function missing');
return array();
return [];
}
@ -262,7 +262,7 @@ class XML
if (! $parser) {
logger('Xml::toArray: xml_parser_create: no resource');
return array();
return [];
}
xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8");
@ -282,15 +282,15 @@ class XML
}
//Initializations
$xml_array = array();
$parents = array();
$opened_tags = array();
$arr = array();
$xml_array = [];
$parents = [];
$opened_tags = [];
$arr = [];
$current = &$xml_array; // Reference
// Go through the tags.
$repeated_tag_index = array(); // Multiple tags with same name will be turned into an array
$repeated_tag_index = []; // Multiple tags with same name will be turned into an array
foreach ($xml_values as $data) {
$tag = $data['tag'];
$type = $data['type'];
@ -298,8 +298,8 @@ class XML
$attributes = isset($data['attributes']) ? $data['attributes'] : null;
$value = isset($data['value']) ? $data['value'] : null;
$result = array();
$attributes_data = array();
$result = [];
$attributes_data = [];
if (isset($value)) {
if ($priority == 'tag') {
@ -344,7 +344,7 @@ class XML
$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
$repeated_tag_index[$tag.'_'.$level]++;
} else { // This section will make the value an array if multiple tags with the same name appear together
$current[$tag] = array($current[$tag], $result); // This will combine the existing item and the new item together to make an array
$current[$tag] = [$current[$tag], $result]; // This will combine the existing item and the new item together to make an array
$repeated_tag_index[$tag.'_'.$level] = 2;
if (isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
@ -374,7 +374,7 @@ class XML
}
$repeated_tag_index[$tag.'_'.$level]++;
} else { // If it is not an array...
$current[$tag] = array($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 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