Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-11-15 20:09:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

XW-2415 make sure render data is an array

Browse source
This commit is contained in:
idradm 2016-12-19 15:17:40 +01:00
parent b4f12c868f
commit 7166ca0470
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
services/Parser/Nodes/Node.php
View file

@ -36,22 +36,22 @@ class Node {
}
public function getSourcesMetadata() {
$metadata = [];
$metadata = [ ];
$sources = $this->getSources();
$sourcesLength = count( $sources );
$baseLabel = \Sanitizer::stripAllTags( $this->getInnerValue( $this->xmlNode->{self::LABEL_TAG_NAME} ) );
foreach ( $sources as $source ) {
$metadata[$source] = [];
$metadata[$source]['label'] = ( $sourcesLength > 1 ) ?
$metadata[ $source ] = [ ];
$metadata[ $source ][ 'label' ] = ( $sourcesLength > 1 ) ?
( !empty( $baseLabel ) ? "{$baseLabel} ({$source})" : '' ) :
$baseLabel ;
$baseLabel;
}
if ( $sourcesLength > 0 && $this->hasPrimarySource( $this->xmlNode ) ) {
// self::extractSourcesFromNode() puts the value of the `source` attribute as the first element of $sources
$firstSource = reset( $sources );
$metadata[$firstSource]['primary'] = true;
$metadata[ $firstSource ][ 'primary' ] = true;
}
return $metadata;
@ -174,11 +174,13 @@ class Node {
}
protected function getRenderDataForChildren() {
return array_map( function ( Node $item ) {
$renderData = array_map( function ( Node $item ) {
return $item->getRenderData();
}, array_filter( $this->getChildNodes(), function ( Node $item ) {
return !$item->isEmpty();
} ) );
// rebase keys
return array_values( $renderData );
}
protected function getSourcesForChildren() {
@ -258,7 +260,7 @@ class Node {
*/
protected function extractSourcesFromNode( \SimpleXMLElement $xmlNode ) {
$sources = $this->hasPrimarySource( $xmlNode ) ?
[ $this->getXmlAttribute( $xmlNode, self::DATA_SRC_ATTR_NAME ) ] : [];
[ $this->getXmlAttribute( $xmlNode, self::DATA_SRC_ATTR_NAME ) ] : [ ];
if ( $xmlNode->{self::FORMAT_TAG_NAME} ) {
$sources = $this->matchVariables( $xmlNode->{self::FORMAT_TAG_NAME}, $sources );
@ -271,7 +273,7 @@ class Node {
}
protected function hasPrimarySource( \SimpleXMLElement $xmlNode ) {
return (bool) $this->getXmlAttribute( $xmlNode, self::DATA_SRC_ATTR_NAME );
return (bool)$this->getXmlAttribute( $xmlNode, self::DATA_SRC_ATTR_NAME );
}
protected function matchVariables( \SimpleXMLElement $node, array $source ) {