Merge pull request #14036 from eileenmcnaughton/5.13

[civicrm-core.git] / CRM / Utils / XML.php

diff --git a/CRM/Utils/XML.php b/CRM/Utils/XML.php
index dda751045abadc0c361d938fa6064879a51d8750..daaf0a6772599eaecfc995132f72e7dc51db323d 100644 (file)
--- a/CRM/Utils/XML.php
+++ b/CRM/Utils/XML.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -27,7 +27,7 @@
 
 /**
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 class CRM_Utils_XML {
 
@@ -40,8 +40,10 @@ class CRM_Utils_XML {
    *   (0 => SimpleXMLElement|FALSE, 1 => errorMessage|FALSE)
    */
   public static function parseFile($file) {
-    $xml = FALSE; // SimpleXMLElement
-    $error = FALSE; // string
+    // SimpleXMLElement
+    $xml = FALSE;
+    // string
+    $error = FALSE;
 
     if (!file_exists($file)) {
       $error = 'File ' . $file . ' does not exist.';
@@ -60,7 +62,7 @@ class CRM_Utils_XML {
       libxml_use_internal_errors($oldLibXMLErrors);
     }
 
-    return array($xml, $error);
+    return [$xml, $error];
   }
 
   /**
@@ -72,8 +74,10 @@ class CRM_Utils_XML {
    *   (0 => SimpleXMLElement|FALSE, 1 => errorMessage|FALSE)
    */
   public static function parseString($string) {
-    $xml = FALSE; // SimpleXMLElement
-    $error = FALSE; // string
+    // SimpleXMLElement
+    $xml = FALSE;
+    // string
+    $error = FALSE;
 
     $oldLibXMLErrors = libxml_use_internal_errors();
     libxml_use_internal_errors(TRUE);
@@ -87,7 +91,7 @@ class CRM_Utils_XML {
 
     libxml_use_internal_errors($oldLibXMLErrors);
 
-    return array($xml, $error);
+    return [$xml, $error];
   }
 
   /**
@@ -96,14 +100,14 @@ class CRM_Utils_XML {
    * @return string
    */
   protected static function formatErrors($errors) {
-    $messages = array();
+    $messages = [];
 
     foreach ($errors as $error) {
       if ($error->level != LIBXML_ERR_ERROR && $error->level != LIBXML_ERR_FATAL) {
         continue;
       }
 
-      $parts = array();
+      $parts = [];
       if ($error->file) {
         $parts[] = "File=$error->file";
       }
@@ -126,7 +130,7 @@ class CRM_Utils_XML {
    * @return array
    */
   public static function xmlObjToArray($obj) {
-    $arr = array();
+    $arr = [];
     if (is_object($obj)) {
       $obj = get_object_vars($obj);
     }