wikimedia/mediawiki-extensions-LoginNotify
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/LoginNotify synced 2024-12-03 19:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to newer phan

Browse source 
Bug: T216926
Change-Id: Iadebf5698e8c15db0d0009bd66f55c3b534a192f
This commit is contained in:
Kunal Mehta 2019-03-17 16:17:46 -07:00
parent 112a8678f6
commit c5d999a10d
5 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,7 +1,6 @@
node_modules/ node_modules/
vendor/ vendor/
composer.lock composer.lock
tests/phan/issues
# Editors # Editors
*.kate-swp *.kate-swp

21
.phan/config.php Normal file
View file

@ -0,0 +1,21 @@
<?php
$cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
$cfg['directory_list'] = array_merge(
$cfg['directory_list'],
[
'../../extensions/Echo',
'../../extensions/CentralAuth',
]
);
$cfg['exclude_analysis_directory_list'] = array_merge(
$cfg['exclude_analysis_directory_list'],
[
'../../extensions/Echo',
'../../extensions/CentralAuth',
]
);
return $cfg;

2
composer.json
View file

@ -9,7 +9,7 @@
"mediawiki/mediawiki-codesniffer": "24.0.0", "mediawiki/mediawiki-codesniffer": "24.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2", "jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/minus-x": "0.3.1", "mediawiki/minus-x": "0.3.1",
"mediawiki/mediawiki-phan-config": "0.3.0" "mediawiki/mediawiki-phan-config": "0.5.0"
}, },
"scripts": { "scripts": {
"fix": [ "fix": [

4
includes/LoginNotify.php
View file

@ -324,8 +324,6 @@ class LoginNotify implements LoggerAwareInterface {
/** /**
* Actually do the query of the check user table. * Actually do the query of the check user table.
* *
* @suppress PhanTypeMismatchArgument
*
* @note This catches and ignores database errors. * @note This catches and ignores database errors.
* @param int $userId User id number (Not necessarily for the local wiki) * @param int $userId User id number (Not necessarily for the local wiki)
* @param string $ipFragment Prefix to match against cuc_ip (from $this->getIPNetwork()) * @param string $ipFragment Prefix to match against cuc_ip (from $this->getIPNetwork())
@ -359,8 +357,6 @@ class LoginNotify implements LoggerAwareInterface {
* If we have no info for user, we maybe don't treat it as * If we have no info for user, we maybe don't treat it as
* an unknown IP, since user has no known IPs. * an unknown IP, since user has no known IPs.
* *
* @suppress PhanTypeMismatchArgument
*
* @todo FIXME Does this behaviour make sense, esp. with cookie check? * @todo FIXME Does this behaviour make sense, esp. with cookie check?
* @param int $userId User id number (possibly on foreign wiki) * @param int $userId User id number (possibly on foreign wiki)
* @param Database $dbr DB connection (possibly to foreign wiki) * @param Database $dbr DB connection (possibly to foreign wiki)

21
tests/phan/config.php
View file

@ -1,21 +0,0 @@
<?php
$cfg = require __DIR__ . '/../../vendor/mediawiki/mediawiki-phan-config/src/config.php';
$cfg['directory_list'] = array_merge(
$cfg['directory_list'],
[
'./../../extensions/Echo',
'./../../extensions/CentralAuth',
]
);
$cfg['exclude_analysis_directory_list'] = array_merge(
$cfg['exclude_analysis_directory_list'],
[
'./../../extensions/Echo',
'./../../extensions/CentralAuth',
]
);
return $cfg;