@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | $this->setErrorChecking($error_checking); |
42 | 42 | |
43 | - if(is_object($xml)){ |
|
43 | + if (is_object($xml)) { |
|
44 | 44 | if (is_a($xml, 'DOMElement')) { |
45 | 45 | $this->appendChild($this->importNode($xml, true)); |
46 | 46 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | @$this->loadXML($xml, LIBXML_COMPACT); |
62 | 62 | } |
63 | 63 | else if (!$this->loadXML($xml, LIBXML_COMPACT)) { |
64 | - trigger_error('BetterDOMDocument\DOMDoc: Could not load: ' . htmlspecialchars($xml), E_USER_WARNING); |
|
64 | + trigger_error('BetterDOMDocument\DOMDoc: Could not load: '.htmlspecialchars($xml), E_USER_WARNING); |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | $prefix = $parts[0]; |
327 | 327 | if (isset($namespaces[$prefix])) { |
328 | 328 | if (!strpos($root_match[0], "xmlns:$prefix")) { |
329 | - $new_root .= " xmlns:$prefix='" . $namespaces[$prefix] . "'"; |
|
329 | + $new_root .= " xmlns:$prefix='".$namespaces[$prefix]."'"; |
|
330 | 330 | } |
331 | 331 | } |
332 | 332 | } |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | |
336 | 336 | $dom = new DOMDoc($xml, $this->auto_ns); |
337 | 337 | if (!$dom->documentElement) { |
338 | - trigger_error('BetterDomDocument\DOMDoc Error: Invalid XML: ' . $xml); |
|
338 | + trigger_error('BetterDomDocument\DOMDoc Error: Invalid XML: '.$xml); |
|
339 | 339 | } |
340 | 340 | $element = $dom->documentElement; |
341 | 341 | |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | $this->createContext($newnode, 'xml'); |
457 | 457 | $this->createContext($context, 'xpath'); |
458 | 458 | |
459 | - if (!$context){ |
|
459 | + if (!$context) { |
|
460 | 460 | return FALSE; |
461 | 461 | } |
462 | 462 | |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | |
544 | 544 | if ($node) { |
545 | 545 | if (is_array($node) || get_class($node) == 'BetterDOMDocument\DOMList') { |
546 | - foreach($node as $item) { |
|
546 | + foreach ($node as $item) { |
|
547 | 547 | $this->remove($item); |
548 | 548 | } |
549 | 549 | } |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | $xsl = ' |
616 | 616 | <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> |
617 | 617 | <xsl:template match="*"> |
618 | - <xsl:element name="' . $prefix . ':{local-name()}" namespace="' . $url . '"> |
|
618 | + <xsl:element name="' . $prefix.':{local-name()}" namespace="'.$url.'"> |
|
619 | 619 | <xsl:copy-of select="@*"/> |
620 | 620 | <xsl:apply-templates/> |
621 | 621 | </xsl:element> |
@@ -627,7 +627,7 @@ discard block |
||
627 | 627 | } |
628 | 628 | else { |
629 | 629 | // @@TODO: Report the correct calling file and number |
630 | - throw new Exception("Changing the namespace of a " . get_class($node) . " is not supported"); |
|
630 | + throw new Exception("Changing the namespace of a ".get_class($node)." is not supported"); |
|
631 | 631 | } |
632 | 632 | } |
633 | 633 | |
@@ -702,7 +702,7 @@ discard block |
||
702 | 702 | foreach ($this->getNamespaces() as $prefix => $url) { |
703 | 703 | $namespaces = ''; |
704 | 704 | if ($prefix != 'xsl' && $prefix != 'xlink') { |
705 | - $namespaces .= 'xmlns:' . $prefix . '="' . $url. '" '; |
|
705 | + $namespaces .= 'xmlns:'.$prefix.'="'.$url.'" '; |
|
706 | 706 | } |
707 | 707 | $xslOptions = str_replace("||namespaces||", $namespaces, $xslOptions); |
708 | 708 | } |
@@ -741,8 +741,8 @@ discard block |
||
741 | 741 | |
742 | 742 | // Copy namespace prefixes |
743 | 743 | foreach ($this->ns as $prefix => $namespace) { |
744 | - if (!$context->hasAttribute('xmlns:' . $prefix)) { |
|
745 | - $context->setAttribute('xmlns:' . $prefix, $namespace); |
|
744 | + if (!$context->hasAttribute('xmlns:'.$prefix)) { |
|
745 | + $context->setAttribute('xmlns:'.$prefix, $namespace); |
|
746 | 746 | } |
747 | 747 | } |
748 | 748 | |
@@ -752,7 +752,7 @@ discard block |
||
752 | 752 | // The types listed are html "void" elements. |
753 | 753 | // Find any of these elements that have no child nodes and are therefore candidates for self-closing, replace them with a self-closed version. |
754 | 754 | $pattern = '<(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(\b[^<]*)><\/\1>'; |
755 | - return preg_replace('/' . $pattern . '/', '<$1$2/>', $output); |
|
755 | + return preg_replace('/'.$pattern.'/', '<$1$2/>', $output); |
|
756 | 756 | } |
757 | 757 | else { |
758 | 758 | return $this->saveXML($context, LIBXML_NOEMPTYTAG); |
@@ -807,7 +807,7 @@ discard block |
||
807 | 807 | |
808 | 808 | // If it's an "XML" document, then get namespaces via xpath |
809 | 809 | $xpath = new \DOMXPath($this); |
810 | - foreach($xpath->query('namespace::*') as $namespace) { |
|
810 | + foreach ($xpath->query('namespace::*') as $namespace) { |
|
811 | 811 | if (!empty($namespace->prefix)) { |
812 | 812 | if ($namespace->prefix != 'xml' && $namespace->nodeValue != 'http://www.w3.org/XML/1998/namespace') { |
813 | 813 | $this->registerNamespace($namespace->prefix, $namespace->nodeValue); |
@@ -845,8 +845,8 @@ discard block |
||
845 | 845 | } |
846 | 846 | } |
847 | 847 | } |
848 | - else if (substr($attr->name,0,6) == 'xmlns:') { |
|
849 | - $prefix = substr($attr->name,6); |
|
848 | + else if (substr($attr->name, 0, 6) == 'xmlns:') { |
|
849 | + $prefix = substr($attr->name, 6); |
|
850 | 850 | $this->registerNamespace($prefix, $attr->value); |
851 | 851 | } |
852 | 852 | } |
@@ -55,12 +55,10 @@ discard block |
||
55 | 55 | $this->appendChild($this->importNode($xml->documentElement, true)); |
56 | 56 | } |
57 | 57 | } |
58 | - } |
|
59 | - else if (is_string($xml) && !empty($xml)) { |
|
58 | + } else if (is_string($xml) && !empty($xml)) { |
|
60 | 59 | if ($this->error_checking == 'none') { |
61 | 60 | @$this->loadXML($xml, LIBXML_COMPACT); |
62 | - } |
|
63 | - else if (!$this->loadXML($xml, LIBXML_COMPACT)) { |
|
61 | + } else if (!$this->loadXML($xml, LIBXML_COMPACT)) { |
|
64 | 62 | trigger_error('BetterDOMDocument\DOMDoc: Could not load: ' . htmlspecialchars($xml), E_USER_WARNING); |
65 | 63 | } |
66 | 64 | } |
@@ -115,8 +113,7 @@ discard block |
||
115 | 113 | public function lookupURL($prefix) { |
116 | 114 | if (isset($this->ns[$prefix])) { |
117 | 115 | return $this->ns[$prefix]; |
118 | - } |
|
119 | - else { |
|
116 | + } else { |
|
120 | 117 | return FALSE; |
121 | 118 | } |
122 | 119 | } |
@@ -150,15 +147,13 @@ discard block |
||
150 | 147 | |
151 | 148 | if ($context) { |
152 | 149 | $result = $xob->query($xpath, $context); |
153 | - } |
|
154 | - else { |
|
150 | + } else { |
|
155 | 151 | $result = $xob->query($xpath); |
156 | 152 | } |
157 | 153 | |
158 | 154 | if ($result) { |
159 | 155 | return new DOMList($result, $this); |
160 | - } |
|
161 | - else { |
|
156 | + } else { |
|
162 | 157 | return FALSE; |
163 | 158 | } |
164 | 159 | } |
@@ -182,8 +177,7 @@ discard block |
||
182 | 177 | |
183 | 178 | if (empty($result) || !count($result)) { |
184 | 179 | return FALSE; |
185 | - } |
|
186 | - else { |
|
180 | + } else { |
|
187 | 181 | return $result->item(0); |
188 | 182 | } |
189 | 183 | } |
@@ -262,13 +256,11 @@ discard block |
||
262 | 256 | if ($context->hasChildNodes()) { |
263 | 257 | if ($context->childNodes->length == 1 && $context->firstChild->nodeType == XML_TEXT_NODE) { |
264 | 258 | $array['#text'] = $context->firstChild->nodeValue; |
265 | - } |
|
266 | - else { |
|
259 | + } else { |
|
267 | 260 | foreach ($context->childNodes as $childNode) { |
268 | 261 | if ($childNode->nodeType == XML_ELEMENT_NODE) { |
269 | 262 | $array[$childNode->nodeName][] = $this->getArray($raw, $childNode); |
270 | - } |
|
271 | - elseif ($childNode->nodeType == XML_CDATA_SECTION_NODE) { |
|
263 | + } elseif ($childNode->nodeType == XML_CDATA_SECTION_NODE) { |
|
272 | 264 | $array['#text'] = $childNode->textContent; |
273 | 265 | } |
274 | 266 | } |
@@ -300,8 +292,7 @@ discard block |
||
300 | 292 | $matches = array(); |
301 | 293 | if (preg_match($pattern, $this->saveXML($context), $matches)) { |
302 | 294 | return $matches[1]; |
303 | - } |
|
304 | - else { |
|
295 | + } else { |
|
305 | 296 | return ''; |
306 | 297 | } |
307 | 298 | } |
@@ -371,15 +362,13 @@ discard block |
||
371 | 362 | |
372 | 363 | if ($newnode->ownerDocument === $this) { |
373 | 364 | $appendnode = $newnode; |
374 | - } |
|
375 | - else { |
|
365 | + } else { |
|
376 | 366 | if (is_a($newnode, 'BetterDOMDocument\DOMDoc')) { |
377 | 367 | foreach ($newnode->ns as $prefix => $uri) { |
378 | 368 | $this->registerNamespace($prefix, $uri); |
379 | 369 | } |
380 | 370 | $newnode = $newnode->documentElement; |
381 | - } |
|
382 | - else if (is_a($newnode, 'DOMDocument')) { |
|
371 | + } else if (is_a($newnode, 'DOMDocument')) { |
|
383 | 372 | $newnode = $newnode->documentElement; |
384 | 373 | } |
385 | 374 | $appendnode = $this->importNode($newnode, true); |
@@ -463,20 +452,17 @@ discard block |
||
463 | 452 | if ($context->nextSibling) { |
464 | 453 | // $context has an immediate sibling : insert newnode before this one |
465 | 454 | return $context->parentNode->insertBefore($newnode, $context->nextSibling); |
466 | - } |
|
467 | - else { |
|
455 | + } else { |
|
468 | 456 | // $context has no sibling next to it : insert newnode as last child of it's parent |
469 | 457 | if ($newnode->ownerDocument === $this) { |
470 | 458 | $appendnode = $newnode; |
471 | - } |
|
472 | - else { |
|
459 | + } else { |
|
473 | 460 | if (is_a($newnode, 'BetterDOMDocument\DOMDoc')) { |
474 | 461 | foreach ($newnode->ns as $prefix => $uri) { |
475 | 462 | $this->registerNamespace($prefix, $uri); |
476 | 463 | } |
477 | 464 | $newnode = $newnode->documentElement; |
478 | - } |
|
479 | - else if (is_a($newnode, 'DOMDocument')) { |
|
465 | + } else if (is_a($newnode, 'DOMDocument')) { |
|
480 | 466 | $newnode = $newnode->documentElement; |
481 | 467 | } |
482 | 468 | $appendnode = $this->importNode($newnode, true); |
@@ -546,11 +532,9 @@ discard block |
||
546 | 532 | foreach($node as $item) { |
547 | 533 | $this->remove($item); |
548 | 534 | } |
549 | - } |
|
550 | - else if (get_class($node) == 'DOMNodeList') { |
|
535 | + } else if (get_class($node) == 'DOMNodeList') { |
|
551 | 536 | $this->remove(new DOMList($node, $this)); |
552 | - } |
|
553 | - else { |
|
537 | + } else { |
|
554 | 538 | $parent = $node->parentNode; |
555 | 539 | $parent->removeChild($node); |
556 | 540 | } |
@@ -572,8 +556,7 @@ discard block |
||
572 | 556 | public function tranform($xsl, $context = NULL) { |
573 | 557 | if (!$context) { |
574 | 558 | $doc = $this; |
575 | - } |
|
576 | - else { |
|
559 | + } else { |
|
577 | 560 | if (is_string($context)) { |
578 | 561 | $context = $this->xpathSingle($context); |
579 | 562 | } |
@@ -624,8 +607,7 @@ discard block |
||
624 | 607 | |
625 | 608 | $transformed = $this->tranform($xsl, $node); |
626 | 609 | return $this->replace($node, $transformed->documentElement); |
627 | - } |
|
628 | - else { |
|
610 | + } else { |
|
629 | 611 | // @@TODO: Report the correct calling file and number |
630 | 612 | throw new Exception("Changing the namespace of a " . get_class($node) . " is not supported"); |
631 | 613 | } |
@@ -710,14 +692,12 @@ discard block |
||
710 | 692 | // Add in xlink options |
711 | 693 | if ($options['xlink'] === TRUE) { |
712 | 694 | $options['xlink'] = "@xlink:type = 'simple'"; |
713 | - } |
|
714 | - else if (empty($options['xlink'])) { |
|
695 | + } else if (empty($options['xlink'])) { |
|
715 | 696 | $options['xlink'] = "false()"; |
716 | 697 | } |
717 | 698 | $xslOptions = str_replace("||xlink||", $options['xlink'], $xslOptions); |
718 | 699 | $transformed = $this->tranform($xslOptions, $context); |
719 | - } |
|
720 | - else { |
|
700 | + } else { |
|
721 | 701 | $transformed = $this->tranform($xslSimple, $context); |
722 | 702 | } |
723 | 703 | |
@@ -753,8 +733,7 @@ discard block |
||
753 | 733 | // Find any of these elements that have no child nodes and are therefore candidates for self-closing, replace them with a self-closed version. |
754 | 734 | $pattern = '<(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(\b[^<]*)><\/\1>'; |
755 | 735 | return preg_replace('/' . $pattern . '/', '<$1$2/>', $output); |
756 | - } |
|
757 | - else { |
|
736 | + } else { |
|
758 | 737 | return $this->saveXML($context, LIBXML_NOEMPTYTAG); |
759 | 738 | } |
760 | 739 | } |
@@ -770,8 +749,7 @@ discard block |
||
770 | 749 | // Check up error-checking |
771 | 750 | if ($error_checking == FALSE) { |
772 | 751 | $this->error_checking = 'none'; |
773 | - } |
|
774 | - else { |
|
752 | + } else { |
|
775 | 753 | $this->error_checking = $error_checking; |
776 | 754 | } |
777 | 755 | if ($this->error_checking != 'strict') { |
@@ -812,8 +790,7 @@ discard block |
||
812 | 790 | if ($namespace->prefix != 'xml' && $namespace->nodeValue != 'http://www.w3.org/XML/1998/namespace') { |
813 | 791 | $this->registerNamespace($namespace->prefix, $namespace->nodeValue); |
814 | 792 | } |
815 | - } |
|
816 | - else { |
|
793 | + } else { |
|
817 | 794 | $this->default_ns = $namespace->nodeValue; |
818 | 795 | if (is_string($auto_register_namespaces)) { |
819 | 796 | $this->registerNamespace($auto_register_namespaces, $namespace->nodeValue); |
@@ -844,8 +821,7 @@ discard block |
||
844 | 821 | $this->registerNamespace($tagname, $attr->value); |
845 | 822 | } |
846 | 823 | } |
847 | - } |
|
848 | - else if (substr($attr->name,0,6) == 'xmlns:') { |
|
824 | + } else if (substr($attr->name,0,6) == 'xmlns:') { |
|
849 | 825 | $prefix = substr($attr->name,6); |
850 | 826 | $this->registerNamespace($prefix, $attr->value); |
851 | 827 | } |