Merge "Clean up array() in docs, Part I"

diff --combined includes/GlobalFunctions.php
index e262c81,0ff4dca..e19c36c
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -222,17 -222,17 +222,17 @@@ function wfAppendToArrayIfNotDefault( $
   * Merge arrays in the style of getUserPermissionsErrors, with duplicate removal
   * e.g.
   *    wfMergeErrorArrays(
-  *            array( array( 'x' ) ),
-  *            array( array( 'x', '2' ) ),
-  *            array( array( 'x' ) ),
-  *            array( array( 'y' ) )
+  *            [ [ 'x' ] ],
+  *            [ [ 'x', '2' ] ],
+  *            [ [ 'x' ] ],
+  *            [ [ 'y' ] ]
   *    );
   * returns:
-  *            array(
-  *            array( 'x', '2' ),
-  *            array( 'x' ),
-  *            array( 'y' )
-  *    )
+  *            [
+  *            [ 'x', '2' ],
+  *            [ 'x' ],
+  *            [ 'y' ]
+  *    ]
   *
   * @param array $array1,...
   * @return array
@@@ -827,7 -827,7 +827,7 @@@ function wfParseUrl( $url ) 
        $bits = parse_url( $url );
        MediaWiki\restoreWarnings();
        // parse_url() returns an array without scheme for some invalid URLs, e.g.
-       // parse_url("%0Ahttp://example.com") == array( 'host' => '%0Ahttp', 'path' => 'example.com' )
+       // parse_url("%0Ahttp://example.com") == [ 'host' => '%0Ahttp', 'path' => 'example.com' ]
        if ( !$bits || !isset( $bits['scheme'] ) ) {
                return false;
        }
@@@ -3350,9 -3350,9 +3350,9 @@@ function wfCountDown( $seconds ) 
  }
  
  /**
 - * Replace all invalid characters with -
 - * Additional characters can be defined in $wgIllegalFileChars (see bug 20489)
 - * By default, $wgIllegalFileChars = ':'
 + * Replace all invalid characters with '-'.
 + * Additional characters can be defined in $wgIllegalFileChars (see T22489).
 + * By default, $wgIllegalFileChars includes ':', '/', '\'.
   *
   * @param string $name Filename to process
   * @return string
@@@ -3360,13 -3360,12 +3360,13 @@@
  function wfStripIllegalFilenameChars( $name ) {
        global $wgIllegalFileChars;
        $illegalFileChars = $wgIllegalFileChars ? "|[" . $wgIllegalFileChars . "]" : '';
 -      $name = wfBaseName( $name );
        $name = preg_replace(
                "/[^" . Title::legalChars() . "]" . $illegalFileChars . "/",
                '-',
                $name
        );
 +      // $wgIllegalFileChars may not include '/' and '\', so we still need to do this
 +      $name = wfBaseName( $name );
        return $name;
  }
  

diff --combined includes/SiteConfiguration.php
index 9fd5983,ffeb44d..885f926
--- 1/includes/SiteConfiguration.php
--- 2/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@@ -36,15 -36,15 +36,15 @@@
   *
   * @code
   * $conf = new SiteConfiguration;
-  * $conf->wikis = array( 'de', 'en', 'beta' );
+  * $conf->wikis = [ 'de', 'en', 'beta' ];
   * @endcode
   *
   * When configuring the MediaWiki global settings (the $wg variables),
   * the identifiers will be available to specify settings on a per wiki basis.
   *
   * @code
-  * $conf->settings = array(
-  *    'wgSomeSetting' => array(
+  * $conf->settings = [
+  *    'wgSomeSetting' => [
   *
   *            # production:
   *            'de'     => false,
@@@ -52,8 -52,8 +52,8 @@@
   *
   *            # test:
   *            'beta    => true,
-  *    ),
-  * );
+  *    ],
+  * ];
   * @endcode
   *
   * With three wikis, that is easy to manage. But what about a farm with
@@@ -62,15 -62,15 +62,15 @@@
   * the above code could be written:
   *
   * @code
-  * $conf->settings = array(
-  *    'wgSomeSetting' => array(
+  * $conf->settings = [
+  *    'wgSomeSetting' => [
   *
   *            'default' => false,
   *
   *            # Enable feature on test
   *            'beta'    => true,
-  *    ),
-  * );
+  *    ],
+  * ];
   * @endcode
   *
   *
@@@ -80,23 -80,23 +80,23 @@@
   * on a per wiki basis.
   *
   * @code
-  * $conf->settings = array(
-  *    'wgMergeSetting' = array(
+  * $conf->settings = [
+  *    'wgMergeSetting' = [
   *            # Value that will be shared among all wikis:
-  *            'default' => array( NS_USER => true ),
+  *            'default' => [ NS_USER => true ],
   *
   *            # Leading '+' means merging the array of value with the defaults
-  *            '+beta' => array( NS_HELP => true ),
-  *    ),
-  * );
+  *            '+beta' => [ NS_HELP => true ],
+  *    ],
+  * ];
   *
   * # Get configuration for the German site:
   * $conf->get( 'wgMergeSetting', 'de' );
-  * // --> array( NS_USER => true );
+  * // --> [ NS_USER => true ];
   *
   * # Get configuration for the testing site:
   * $conf->get( 'wgMergeSetting', 'beta' );
-  * // --> array( NS_USER => true, NS_HELP => true );
+  * // --> [ NS_USER => true, NS_HELP => true ];
   * @endcode
   *
   * Finally, to load all configuration settings, extract them in global context:
@@@ -108,14 -108,9 +108,14 @@@
   * extract( $globals );
   * @endcode
   *
 + * @note For WikiMap to function, the configuration must define string values for
 + *  $wgServer (or $wgCanonicalServer) and $wgArticlePath, even if these are the
 + *  same for all wikis or can be correctly determined by the logic in
 + *  Setup.php.
 + *
   * @todo Give examples for,
   * suffixes:
-  * $conf->suffixes = array( 'wiki' );
+  * $conf->suffixes = [ 'wiki' ];
   * localVHosts
   * callbacks!
   */