jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371303 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
Change-Id: I7891cb9930bce02b20a971dfe2d08c75ab118577
---
M composer.json
M includes/Coord.php
M includes/Globe.php
M includes/Hooks.php
4 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index bf202bf..770de83 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/mediawiki-codesniffer": "0.10.1"
+ "mediawiki/mediawiki-codesniffer": "0.11.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/Coord.php b/includes/Coord.php
index e952b1e..ca455aa 100644
--- a/includes/Coord.php
+++ b/includes/Coord.php
@@ -142,7 +142,7 @@
*/
public function getRow( $pageId ) {
global $wgGeoDataIndexGranularity, $wgGeoDataBackend;
- $row = [ 'gt_page_id' => $pageId ];
+ $row = [ 'gt_page_id' => $pageId ];
foreach ( self::$fieldMapping as $field => $column ) {
$row[$column] = $this->$field;
}
diff --git a/includes/Globe.php b/includes/Globe.php
index d1271d1..db5260d 100644
--- a/includes/Globe.php
+++ b/includes/Globe.php
@@ -67,10 +67,10 @@
* Radii taken from Wikipedia. Globes that are too irregular in
shape don't have radius set.
*/
$data = [
- 'earth' => $earth + [ 'radius' =>
Math::EARTH_RADIUS ],
+ 'earth' => $earth + [ 'radius' =>
Math::EARTH_RADIUS ],
'mercury' => $west360 + [ 'radius' => 2439700.0 ],
'venus' => $east360 + [ 'radius' => 6051800.0 ],
- 'moon' => $earth + [ 'radius' => 1737100.0 ],
+ 'moon' => $earth + [ 'radius' => 1737100.0 ],
'mars' => $east360 + [ 'radius' => 3389500.0 ], //
Assuming MDIM 2.1
'phobos' => $west360,
'deimos' => $west360,
@@ -80,20 +80,20 @@
'callisto' => $west360 + [ 'radius' => 2410300.0 ],
'io' => $west360 + [ 'radius' => 1821600.0 ],
'europa' => $west360 + [ 'radius' => 1560800.0 ],
- 'mimas' => $west360 + [ 'radius' => 198200.0 ],
- 'enceladus' => $west360 + [ 'radius' => 252100.0 ],
- 'tethys' => $west360 + [ 'radius' => 531100.0 ],
- 'dione' => $west360 + [ 'radius' => 561400.0 ],
- 'rhea' => $west360 + [ 'radius' => 763800.0 ],
+ 'mimas' => $west360 + [ 'radius' => 198200.0 ],
+ 'enceladus' => $west360 + [ 'radius' => 252100.0 ],
+ 'tethys' => $west360 + [ 'radius' => 531100.0 ],
+ 'dione' => $west360 + [ 'radius' => 561400.0 ],
+ 'rhea' => $west360 + [ 'radius' => 763800.0 ],
'titan' => $west360 + [ 'radius' => 2575500.0 ],
'hyperion' => $west360,
- 'iapetus' => $west360 + [ 'radius' => 734500.0 ],
+ 'iapetus' => $west360 + [ 'radius' => 734500.0 ],
'phoebe' => $west360,
- 'miranda' => $east360 + [ 'radius' => 235800.0 ],
- 'ariel' => $east360 + [ 'radius' => 578900.0 ],
- 'umbriel' => $east360 + [ 'radius' => 584700.0 ],
- 'titania' => $east360 + [ 'radius' => 788400.0 ],
- 'oberon' => $east360 + [ 'radius' => 761400.0 ],
+ 'miranda' => $east360 + [ 'radius' => 235800.0 ],
+ 'ariel' => $east360 + [ 'radius' => 578900.0 ],
+ 'umbriel' => $east360 + [ 'radius' => 584700.0 ],
+ 'titania' => $east360 + [ 'radius' => 788400.0 ],
+ 'oberon' => $east360 + [ 'radius' => 761400.0 ],
'triton' => $east360 + [ 'radius' => 1353400.0 ],
'pluto' => $east360 + [ 'radius' => 1187000.0 ], //
???
];
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 94b4053..7b94a0f 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -271,7 +271,7 @@
*/
public static function onSearchIndexFields( array &$fields,
SearchEngine $engine ) {
global $wgGeoDataUseCirrusSearch, $wgGeoDataBackend;
- if ( !$wgGeoDataUseCirrusSearch && $wgGeoDataBackend !==
'elastic' ) {
+ if ( !$wgGeoDataUseCirrusSearch && $wgGeoDataBackend !==
'elastic' ) {
return;
}
if ( $engine instanceof \CirrusSearch ) {
--
To view, visit https://gerrit.wikimedia.org/r/371303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7891cb9930bce02b20a971dfe2d08c75ab118577
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
