Merge "Properly detect if CACHE_ACCEL is available in the installer"

[lhc/web/wiklou.git] / includes / site / SiteImporter.php

diff --git a/includes/site/SiteImporter.php b/includes/site/SiteImporter.php
index 02c3ca4..42812e1 100644 (file)
--- a/includes/site/SiteImporter.php
+++ b/includes/site/SiteImporter.php
@@ -90,7 +90,9 @@ class SiteImporter {
 
                        foreach ( $errors as $error ) {
                                /** @var LibXMLError $error */
-                               throw new InvalidArgumentException( 'Malformed XML: ' . $error->message . ' in line ' . $error->line );
+                               throw new InvalidArgumentException(
+                                       'Malformed XML: ' . $error->message . ' in line ' . $error->line
+                               );
                        }
 
                        throw new InvalidArgumentException( 'Malformed XML!' );
@@ -114,7 +116,7 @@ class SiteImporter {
         * @return Site[]
         */
        private function makeSiteList( DOMElement $root ) {
-               $sites = array();
+               $sites = [];
 
                // Old sites, to get the row IDs that correspond to the global site IDs.
                // TODO: Get rid of internal row IDs, they just get in the way. Get rid of ORMRow, too.
@@ -181,8 +183,8 @@ class SiteImporter {
                        $site->addLocalId( $idType, $id );
                }
 
-               //@todo: import <data>
-               //@todo: import <config>
+               // @todo: import <data>
+               // @todo: import <config>
 
                return $site;
        }
@@ -202,7 +204,9 @@ class SiteImporter {
                        if ( $default !== false ) {
                                return $default;
                        } else {
-                               throw new MWException( 'Required ' . $name . ' attribute not found in <' . $element->tagName . '> tag' );
+                               throw new MWException(
+                                       'Required ' . $name . ' attribute not found in <' . $element->tagName . '> tag'
+                               );
                        }
                }
 
@@ -224,7 +228,9 @@ class SiteImporter {
                        if ( $default !== false ) {
                                return $default;
                        } else {
-                               throw new MWException( 'Required <' . $name . '> tag not found inside <' . $element->tagName . '> tag' );
+                               throw new MWException(
+                                       'Required <' . $name . '> tag not found inside <' . $element->tagName . '> tag'
+                               );
                        }
                }