Phantom42 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405552 )
Change subject: Fix multiple PHP class declarations in one file in includes/auth
......................................................................
Fix multiple PHP class declarations in one file in includes/auth
All files containing more than one PHP class were splitted into
multiple files. Autoloader references were updated to match new
class locations.
Bug: T177809
Change-Id: I4420bd7b18156d75a42b1a26e222592acf6b50dc
---
M autoload.php
M includes/auth/AuthManagerAuthPlugin.php
A includes/auth/AuthManagerAuthPluginUser.php
3 files changed, 50 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/405552/1
diff --git a/autoload.php b/autoload.php
index 9e557e1..b6b655a 100644
--- a/autoload.php
+++ b/autoload.php
@@ -844,7 +844,7 @@
'MediaWiki\\Auth\\AbstractSecondaryAuthenticationProvider' => __DIR__ .
'/includes/auth/AbstractSecondaryAuthenticationProvider.php',
'MediaWiki\\Auth\\AuthManager' => __DIR__ .
'/includes/auth/AuthManager.php',
'MediaWiki\\Auth\\AuthManagerAuthPlugin' => __DIR__ .
'/includes/auth/AuthManagerAuthPlugin.php',
- 'MediaWiki\\Auth\\AuthManagerAuthPluginUser' => __DIR__ .
'/includes/auth/AuthManagerAuthPlugin.php',
+ 'MediaWiki\\Auth\\AuthManagerAuthPluginUser' => __DIR__ .
'/includes/auth/AuthManagerAuthPluginUser.php',
'MediaWiki\\Auth\\AuthPluginPrimaryAuthenticationProvider' => __DIR__ .
'/includes/auth/AuthPluginPrimaryAuthenticationProvider.php',
'MediaWiki\\Auth\\AuthenticationProvider' => __DIR__ .
'/includes/auth/AuthenticationProvider.php',
'MediaWiki\\Auth\\AuthenticationRequest' => __DIR__ .
'/includes/auth/AuthenticationRequest.php',
diff --git a/includes/auth/AuthManagerAuthPlugin.php
b/includes/auth/AuthManagerAuthPlugin.php
index 9a1e445..2b0ce44 100644
--- a/includes/auth/AuthManagerAuthPlugin.php
+++ b/includes/auth/AuthManagerAuthPlugin.php
@@ -198,33 +198,3 @@
return [];
}
}
-
-/**
- * @since 1.27
- * @deprecated since 1.27
- */
-class AuthManagerAuthPluginUser extends \AuthPluginUser {
- /** @var User */
- private $user;
-
- function __construct( $user ) {
- $this->user = $user;
- }
-
- public function getId() {
- return $this->user->getId();
- }
-
- public function isLocked() {
- return $this->user->isLocked();
- }
-
- public function isHidden() {
- return $this->user->isHidden();
- }
-
- public function resetAuthToken() {
-
\MediaWiki\Session\SessionManager::singleton()->invalidateSessionsForUser(
$this->user );
- return true;
- }
-}
diff --git a/includes/auth/AuthManagerAuthPluginUser.php
b/includes/auth/AuthManagerAuthPluginUser.php
new file mode 100644
index 0000000..98a0494
--- /dev/null
+++ b/includes/auth/AuthManagerAuthPluginUser.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @since 1.27
+ * @deprecated since 1.27
+ */
+class AuthManagerAuthPluginUser extends \AuthPluginUser {
+ /** @var User */
+ private $user;
+
+ function __construct( $user ) {
+ $this->user = $user;
+ }
+
+ public function getId() {
+ return $this->user->getId();
+ }
+
+ public function isLocked() {
+ return $this->user->isLocked();
+ }
+
+ public function isHidden() {
+ return $this->user->isHidden();
+ }
+
+ public function resetAuthToken() {
+
\MediaWiki\Session\SessionManager::singleton()->invalidateSessionsForUser(
$this->user );
+ return true;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/405552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4420bd7b18156d75a42b1a26e222592acf6b50dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Phantom42 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
