From: jenkins-bot Date: Thu, 8 Feb 2018 20:44:28 +0000 (+0000) Subject: Merge "Remove unused code from LegacyHookPreAuthenticationProvider" X-Git-Tag: 1.31.0-rc.0~664 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=d8fd78cac06f5d800264ed926562472c9ecd5d68;hp=564c96b63c75921bb5e3ff6edb9a9fdf27417d43;p=lhc%2Fweb%2Fwiklou.git Merge "Remove unused code from LegacyHookPreAuthenticationProvider" --- diff --git a/includes/auth/AuthManagerAuthPlugin.php b/includes/auth/AuthManagerAuthPlugin.php index 9a1e44547c..4f84b4c67d 100644 --- a/includes/auth/AuthManagerAuthPlugin.php +++ b/includes/auth/AuthManagerAuthPlugin.php @@ -20,6 +20,7 @@ namespace MediaWiki\Auth; +use Psr\Log\LoggerInterface; use User; /** @@ -31,7 +32,7 @@ class AuthManagerAuthPlugin extends \AuthPlugin { /** @var string|null */ protected $domain = null; - /** @var \\Psr\\Log\\LoggerInterface */ + /** @var LoggerInterface */ protected $logger = null; public function __construct() { diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php index b8f7b733b6..e4056ee712 100644 --- a/tests/phpunit/includes/auth/AuthManagerTest.php +++ b/tests/phpunit/includes/auth/AuthManagerTest.php @@ -2,10 +2,13 @@ namespace MediaWiki\Auth; +use Config; use MediaWiki\Session\SessionInfo; use MediaWiki\Session\UserInfo; +use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; use StatusValue; +use WebRequest; use Wikimedia\ScopedCallback; use Wikimedia\TestingAccessWrapper; @@ -19,7 +22,7 @@ class AuthManagerTest extends \MediaWikiTestCase { protected $request; /** @var Config */ protected $config; - /** @var \\Psr\\Log\\LoggerInterface */ + /** @var LoggerInterface */ protected $logger; protected $preauthMocks = [];