dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add @covers tags for more tests
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
SiteConfigurationTest.php
diff --git
a/tests/phpunit/includes/SiteConfigurationTest.php
b/tests/phpunit/includes/SiteConfigurationTest.php
index
6547c87
..
bdd4b1e
100644
(file)
--- a/
tests/phpunit/includes/SiteConfigurationTest.php
+++ b/
tests/phpunit/includes/SiteConfigurationTest.php
@@
-12,68
+12,68
@@
class SiteConfigurationTest extends MediaWikiTestCase {
$this->mConf = new SiteConfiguration;
$this->mConf = new SiteConfiguration;
- $this->mConf->suffixes =
array( 'wikipedia' => 'wiki' )
;
- $this->mConf->wikis =
array( 'enwiki', 'dewiki', 'frwiki' )
;
- $this->mConf->settings =
array(
- 'simple' =>
array(
+ $this->mConf->suffixes =
[ 'wikipedia' => 'wiki' ]
;
+ $this->mConf->wikis =
[ 'enwiki', 'dewiki', 'frwiki' ]
;
+ $this->mConf->settings =
[
+ 'simple' =>
[
'wiki' => 'wiki',
'tag' => 'tag',
'enwiki' => 'enwiki',
'dewiki' => 'dewiki',
'frwiki' => 'frwiki',
'wiki' => 'wiki',
'tag' => 'tag',
'enwiki' => 'enwiki',
'dewiki' => 'dewiki',
'frwiki' => 'frwiki',
-
)
,
+
]
,
- 'fallback' =>
array(
+ 'fallback' =>
[
'default' => 'default',
'wiki' => 'wiki',
'tag' => 'tag',
'default' => 'default',
'wiki' => 'wiki',
'tag' => 'tag',
-
)
,
+
]
,
- 'params' =>
array(
+ 'params' =>
[
'default' => '$lang $site $wiki',
'default' => '$lang $site $wiki',
-
)
,
+
]
,
- '+global' =>
array(
- 'wiki' =>
array(
+ '+global' =>
[
+ 'wiki' =>
[
'wiki' => 'wiki',
'wiki' => 'wiki',
-
)
,
- 'tag' =>
array(
+
]
,
+ 'tag' =>
[
'tag' => 'tag',
'tag' => 'tag',
-
)
,
- 'enwiki' =>
array(
+
]
,
+ 'enwiki' =>
[
'enwiki' => 'enwiki',
'enwiki' => 'enwiki',
-
)
,
- 'dewiki' =>
array(
+
]
,
+ 'dewiki' =>
[
'dewiki' => 'dewiki',
'dewiki' => 'dewiki',
-
)
,
- 'frwiki' =>
array(
+
]
,
+ 'frwiki' =>
[
'frwiki' => 'frwiki',
'frwiki' => 'frwiki',
-
)
,
-
)
,
+
]
,
+
]
,
- 'merge' =>
array(
- '+wiki' =>
array(
+ 'merge' =>
[
+ '+wiki' =>
[
'wiki' => 'wiki',
'wiki' => 'wiki',
-
)
,
- '+tag' =>
array(
+
]
,
+ '+tag' =>
[
'tag' => 'tag',
'tag' => 'tag',
-
)
,
- 'default' =>
array(
+
]
,
+ 'default' =>
[
'default' => 'default',
'default' => 'default',
-
)
,
- '+enwiki' =>
array(
+
]
,
+ '+enwiki' =>
[
'enwiki' => 'enwiki',
'enwiki' => 'enwiki',
-
)
,
- '+dewiki' =>
array(
+
]
,
+ '+dewiki' =>
[
'dewiki' => 'dewiki',
'dewiki' => 'dewiki',
-
)
,
- '+frwiki' =>
array(
+
]
,
+ '+frwiki' =>
[
'frwiki' => 'frwiki',
'frwiki' => 'frwiki',
-
)
,
-
)
,
-
)
;
+
]
,
+
]
,
+
]
;
- $GLOBALS['global'] =
array( 'global' => 'global' )
;
+ $GLOBALS['global'] =
[ 'global' => 'global' ]
;
}
/**
}
/**
@@
-90,16
+90,16
@@
class SiteConfigurationTest extends MediaWikiTestCase {
}
}
}
}
- return
array(
+ return
[
'suffix' => $site,
'lang' => $lang,
'suffix' => $site,
'lang' => $lang,
- 'params' =>
array(
+ 'params' =>
[
'lang' => $lang,
'site' => $site,
'wiki' => $wiki,
'lang' => $lang,
'site' => $site,
'wiki' => $wiki,
-
)
,
- 'tags' =>
array( 'tag' )
,
-
)
;
+
]
,
+ 'tags' =>
[ 'tag' ]
,
+
]
;
}
/**
}
/**
@@
-107,24
+107,24
@@
class SiteConfigurationTest extends MediaWikiTestCase {
*/
public function testSiteFromDb() {
$this->assertEquals(
*/
public function testSiteFromDb() {
$this->assertEquals(
-
array( 'wikipedia', 'en' )
,
+
[ 'wikipedia', 'en' ]
,
$this->mConf->siteFromDB( 'enwiki' ),
'siteFromDB()'
);
$this->assertEquals(
$this->mConf->siteFromDB( 'enwiki' ),
'siteFromDB()'
);
$this->assertEquals(
-
array( 'wikipedia', '' )
,
+
[ 'wikipedia', '' ]
,
$this->mConf->siteFromDB( 'wiki' ),
'siteFromDB() on a suffix'
);
$this->assertEquals(
$this->mConf->siteFromDB( 'wiki' ),
'siteFromDB() on a suffix'
);
$this->assertEquals(
-
array( null, null )
,
+
[ null, null ]
,
$this->mConf->siteFromDB( 'wikien' ),
'siteFromDB() on a non-existing wiki'
);
$this->mConf->siteFromDB( 'wikien' ),
'siteFromDB() on a non-existing wiki'
);
- $this->mConf->suffixes =
array( 'wiki', '' )
;
+ $this->mConf->suffixes =
[ 'wiki', '' ]
;
$this->assertEquals(
$this->assertEquals(
-
array( '', 'wikien' )
,
+
[ '', 'wikien' ]
,
$this->mConf->siteFromDB( 'wikien' ),
'siteFromDB() on a non-existing wiki (2)'
);
$this->mConf->siteFromDB( 'wikien' ),
'siteFromDB() on a non-existing wiki (2)'
);
@@
-135,7
+135,7
@@
class SiteConfigurationTest extends MediaWikiTestCase {
*/
public function testGetLocalDatabases() {
$this->assertEquals(
*/
public function testGetLocalDatabases() {
$this->assertEquals(
-
array( 'enwiki', 'dewiki', 'frwiki' )
,
+
[ 'enwiki', 'dewiki', 'frwiki' ]
,
$this->mConf->getLocalDatabases(),
'getLocalDatabases()'
);
$this->mConf->getLocalDatabases(),
'getLocalDatabases()'
);
@@
-178,7
+178,7
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
$this->assertEquals(
'tag',
);
$this->assertEquals(
'tag',
- $this->mConf->get( 'fallback', 'dewiki', 'wiki',
array(), array( 'tag' )
),
+ $this->mConf->get( 'fallback', 'dewiki', 'wiki',
[], [ 'tag' ]
),
'get(): fallback setting on an existing wiki (with wiki tag)'
);
$this->assertEquals(
'get(): fallback setting on an existing wiki (with wiki tag)'
);
$this->assertEquals(
@@
-188,7
+188,7
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
$this->assertEquals(
'wiki',
);
$this->assertEquals(
'wiki',
- $this->mConf->get( 'fallback', 'wiki', 'wiki',
array(), array( 'tag' )
),
+ $this->mConf->get( 'fallback', 'wiki', 'wiki',
[], [ 'tag' ]
),
'get(): fallback setting on an suffix (with wiki tag)'
);
$this->assertEquals(
'get(): fallback setting on an suffix (with wiki tag)'
);
$this->assertEquals(
@@
-198,50
+198,50
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
$this->assertEquals(
'tag',
);
$this->assertEquals(
'tag',
- $this->mConf->get( 'fallback', 'eswiki', 'wiki',
array(), array( 'tag' )
),
+ $this->mConf->get( 'fallback', 'eswiki', 'wiki',
[], [ 'tag' ]
),
'get(): fallback setting on an non-existing wiki (with wiki tag)'
);
'get(): fallback setting on an non-existing wiki (with wiki tag)'
);
- $common =
array( 'wiki' => 'wiki', 'default' => 'default' )
;
- $commonTag =
array( 'tag' => 'tag', 'wiki' => 'wiki', 'default' => 'default' )
;
+ $common =
[ 'wiki' => 'wiki', 'default' => 'default' ]
;
+ $commonTag =
[ 'tag' => 'tag', 'wiki' => 'wiki', 'default' => 'default' ]
;
$this->assertEquals(
$this->assertEquals(
-
array( 'enwiki' => 'enwiki' )
+ $common,
+
[ 'enwiki' => 'enwiki' ]
+ $common,
$this->mConf->get( 'merge', 'enwiki', 'wiki' ),
'get(): merging setting on an existing wiki'
);
$this->assertEquals(
$this->mConf->get( 'merge', 'enwiki', 'wiki' ),
'get(): merging setting on an existing wiki'
);
$this->assertEquals(
-
array( 'enwiki' => 'enwiki' )
+ $commonTag,
- $this->mConf->get( 'merge', 'enwiki', 'wiki',
array(), array( 'tag' )
),
+
[ 'enwiki' => 'enwiki' ]
+ $commonTag,
+ $this->mConf->get( 'merge', 'enwiki', 'wiki',
[], [ 'tag' ]
),
'get(): merging setting on an existing wiki (with tag)'
);
$this->assertEquals(
'get(): merging setting on an existing wiki (with tag)'
);
$this->assertEquals(
-
array( 'dewiki' => 'dewiki' )
+ $common,
+
[ 'dewiki' => 'dewiki' ]
+ $common,
$this->mConf->get( 'merge', 'dewiki', 'wiki' ),
'get(): merging setting on an existing wiki (2)'
);
$this->assertEquals(
$this->mConf->get( 'merge', 'dewiki', 'wiki' ),
'get(): merging setting on an existing wiki (2)'
);
$this->assertEquals(
-
array( 'dewiki' => 'dewiki' )
+ $commonTag,
- $this->mConf->get( 'merge', 'dewiki', 'wiki',
array(), array( 'tag' )
),
+
[ 'dewiki' => 'dewiki' ]
+ $commonTag,
+ $this->mConf->get( 'merge', 'dewiki', 'wiki',
[], [ 'tag' ]
),
'get(): merging setting on an existing wiki (2) (with tag)'
);
$this->assertEquals(
'get(): merging setting on an existing wiki (2) (with tag)'
);
$this->assertEquals(
-
array( 'frwiki' => 'frwiki' )
+ $common,
+
[ 'frwiki' => 'frwiki' ]
+ $common,
$this->mConf->get( 'merge', 'frwiki', 'wiki' ),
'get(): merging setting on an existing wiki (3)'
);
$this->assertEquals(
$this->mConf->get( 'merge', 'frwiki', 'wiki' ),
'get(): merging setting on an existing wiki (3)'
);
$this->assertEquals(
-
array( 'frwiki' => 'frwiki' )
+ $commonTag,
- $this->mConf->get( 'merge', 'frwiki', 'wiki',
array(), array( 'tag' )
),
+
[ 'frwiki' => 'frwiki' ]
+ $commonTag,
+ $this->mConf->get( 'merge', 'frwiki', 'wiki',
[], [ 'tag' ]
),
'get(): merging setting on an existing wiki (3) (with tag)'
);
$this->assertEquals(
'get(): merging setting on an existing wiki (3) (with tag)'
);
$this->assertEquals(
-
array( 'wiki' => 'wiki' )
+ $common,
+
[ 'wiki' => 'wiki' ]
+ $common,
$this->mConf->get( 'merge', 'wiki', 'wiki' ),
'get(): merging setting on an suffix'
);
$this->assertEquals(
$this->mConf->get( 'merge', 'wiki', 'wiki' ),
'get(): merging setting on an suffix'
);
$this->assertEquals(
-
array( 'wiki' => 'wiki' )
+ $commonTag,
- $this->mConf->get( 'merge', 'wiki', 'wiki',
array(), array( 'tag' )
),
+
[ 'wiki' => 'wiki' ]
+ $commonTag,
+ $this->mConf->get( 'merge', 'wiki', 'wiki',
[], [ 'tag' ]
),
'get(): merging setting on an suffix (with tag)'
);
$this->assertEquals(
'get(): merging setting on an suffix (with tag)'
);
$this->assertEquals(
@@
-251,7
+251,7
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
$this->assertEquals(
$commonTag,
);
$this->assertEquals(
$commonTag,
- $this->mConf->get( 'merge', 'eswiki', 'wiki',
array(), array( 'tag' )
),
+ $this->mConf->get( 'merge', 'eswiki', 'wiki',
[], [ 'tag' ]
),
'get(): merging setting on an non-existing wiki (with tag)'
);
}
'get(): merging setting on an non-existing wiki (with tag)'
);
}
@@
-263,17
+263,17
@@
class SiteConfigurationTest extends MediaWikiTestCase {
$this->mConf->siteParamsCallback = 'SiteConfigurationTest::getSiteParamsCallback';
$this->assertEquals(
$this->mConf->siteParamsCallback = 'SiteConfigurationTest::getSiteParamsCallback';
$this->assertEquals(
-
array( 'wiki', 'en' )
,
+
[ 'wiki', 'en' ]
,
$this->mConf->siteFromDB( 'enwiki' ),
'siteFromDB() with callback'
);
$this->assertEquals(
$this->mConf->siteFromDB( 'enwiki' ),
'siteFromDB() with callback'
);
$this->assertEquals(
-
array( 'wiki', '' )
,
+
[ 'wiki', '' ]
,
$this->mConf->siteFromDB( 'wiki' ),
'siteFromDB() with callback on a suffix'
);
$this->assertEquals(
$this->mConf->siteFromDB( 'wiki' ),
'siteFromDB() with callback on a suffix'
);
$this->assertEquals(
-
array( null, null )
,
+
[ null, null ]
,
$this->mConf->siteFromDB( 'wikien' ),
'siteFromDB() with callback on a non-existing wiki'
);
$this->mConf->siteFromDB( 'wikien' ),
'siteFromDB() with callback on a non-existing wiki'
);
@@
-318,18
+318,18
@@
class SiteConfigurationTest extends MediaWikiTestCase {
public function testGetAllGlobals() {
$this->mConf->siteParamsCallback = 'SiteConfigurationTest::getSiteParamsCallback';
public function testGetAllGlobals() {
$this->mConf->siteParamsCallback = 'SiteConfigurationTest::getSiteParamsCallback';
- $getall =
array(
+ $getall =
[
'simple' => 'enwiki',
'fallback' => 'tag',
'params' => 'en wiki enwiki',
'simple' => 'enwiki',
'fallback' => 'tag',
'params' => 'en wiki enwiki',
- 'global' =>
array( 'enwiki' => 'enwiki' )
+ $GLOBALS['global'],
- 'merge' =>
array(
+ 'global' =>
[ 'enwiki' => 'enwiki' ]
+ $GLOBALS['global'],
+ 'merge' =>
[
'enwiki' => 'enwiki',
'tag' => 'tag',
'wiki' => 'wiki',
'default' => 'default'
'enwiki' => 'enwiki',
'tag' => 'tag',
'wiki' => 'wiki',
'default' => 'default'
-
)
,
-
)
;
+
]
,
+
]
;
$this->assertEquals( $getall, $this->mConf->getAll( 'enwiki' ), 'getAll()' );
$this->mConf->extractAllGlobals( 'enwiki', 'wiki' );
$this->assertEquals( $getall, $this->mConf->getAll( 'enwiki' ), 'getAll()' );
$this->mConf->extractAllGlobals( 'enwiki', 'wiki' );