diff options
Diffstat (limited to 'includes/session')
-rw-r--r-- | includes/session/BotPasswordSessionProvider.php | 2 | ||||
-rw-r--r-- | includes/session/CookieSessionProvider.php | 6 | ||||
-rw-r--r-- | includes/session/CsrfTokenSet.php | 2 | ||||
-rw-r--r-- | includes/session/Hook/SessionCheckInfoHook.php | 2 | ||||
-rw-r--r-- | includes/session/Hook/SessionMetadataHook.php | 2 | ||||
-rw-r--r-- | includes/session/ImmutableSessionProviderWithCookie.php | 2 | ||||
-rw-r--r-- | includes/session/Session.php | 2 | ||||
-rw-r--r-- | includes/session/SessionBackend.php | 2 | ||||
-rw-r--r-- | includes/session/SessionManager.php | 2 | ||||
-rw-r--r-- | includes/session/SessionManagerInterface.php | 2 | ||||
-rw-r--r-- | includes/session/SessionProvider.php | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/includes/session/BotPasswordSessionProvider.php b/includes/session/BotPasswordSessionProvider.php index a933ef08394d..660e593b0c28 100644 --- a/includes/session/BotPasswordSessionProvider.php +++ b/includes/session/BotPasswordSessionProvider.php @@ -26,8 +26,8 @@ namespace MediaWiki\Session; use BotPassword; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\GrantsInfo; +use MediaWiki\Request\WebRequest; use User; -use WebRequest; /** * Session provider for bot passwords diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php index 8ae1b2580019..321ea3f67651 100644 --- a/includes/session/CookieSessionProvider.php +++ b/includes/session/CookieSessionProvider.php @@ -24,9 +24,9 @@ namespace MediaWiki\Session; use MediaWiki\MainConfigNames; +use MediaWiki\Request\WebRequest; use MediaWiki\User\UserRigorOptions; use User; -use WebRequest; /** * A CookieSessionProvider persists sessions using cookies @@ -328,7 +328,7 @@ class CookieSessionProvider extends SessionProvider { /** * Fetch the user identity from cookies - * @param \WebRequest $request + * @param \MediaWiki\Request\WebRequest $request * @return array (string|null $id, string|null $username, string|null $token) */ protected function getUserInfoFromCookies( $request ) { @@ -342,7 +342,7 @@ class CookieSessionProvider extends SessionProvider { /** * Get a cookie. Contains an auth-specific hack. - * @param \WebRequest $request + * @param \MediaWiki\Request\WebRequest $request * @param string $key * @param string $prefix * @param mixed|null $default diff --git a/includes/session/CsrfTokenSet.php b/includes/session/CsrfTokenSet.php index ef1911864e77..d8f8171892fe 100644 --- a/includes/session/CsrfTokenSet.php +++ b/includes/session/CsrfTokenSet.php @@ -21,7 +21,7 @@ namespace MediaWiki\Session; use LoggedOutEditToken; -use WebRequest; +use MediaWiki\Request\WebRequest; /** * Stores and matches CSRF tokens belonging to a given session user. diff --git a/includes/session/Hook/SessionCheckInfoHook.php b/includes/session/Hook/SessionCheckInfoHook.php index 2ee734273ed3..f54c2f12fa18 100644 --- a/includes/session/Hook/SessionCheckInfoHook.php +++ b/includes/session/Hook/SessionCheckInfoHook.php @@ -2,8 +2,8 @@ namespace MediaWiki\Session\Hook; +use MediaWiki\Request\WebRequest; use MediaWiki\Session\SessionInfo; -use WebRequest; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/session/Hook/SessionMetadataHook.php b/includes/session/Hook/SessionMetadataHook.php index 0336f41d5e00..6f36228eaed8 100644 --- a/includes/session/Hook/SessionMetadataHook.php +++ b/includes/session/Hook/SessionMetadataHook.php @@ -2,8 +2,8 @@ namespace MediaWiki\Session\Hook; +use MediaWiki\Request\WebRequest; use MediaWiki\Session\SessionBackend; -use WebRequest; /** * This is a hook handler interface, see docs/Hooks.md. diff --git a/includes/session/ImmutableSessionProviderWithCookie.php b/includes/session/ImmutableSessionProviderWithCookie.php index da0d65a405c5..83e7f9f4cf05 100644 --- a/includes/session/ImmutableSessionProviderWithCookie.php +++ b/includes/session/ImmutableSessionProviderWithCookie.php @@ -24,7 +24,7 @@ namespace MediaWiki\Session; use MediaWiki\MainConfigNames; -use WebRequest; +use MediaWiki\Request\WebRequest; /** * An ImmutableSessionProviderWithCookie doesn't persist the user, but diff --git a/includes/session/Session.php b/includes/session/Session.php index 3e1cb7184f67..bf855b63b10f 100644 --- a/includes/session/Session.php +++ b/includes/session/Session.php @@ -25,9 +25,9 @@ namespace MediaWiki\Session; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Request\WebRequest; use Psr\Log\LoggerInterface; use User; -use WebRequest; /** * Manages data for an authenticated session diff --git a/includes/session/SessionBackend.php b/includes/session/SessionBackend.php index fd57d3291f8d..0bbf4b840d12 100644 --- a/includes/session/SessionBackend.php +++ b/includes/session/SessionBackend.php @@ -28,9 +28,9 @@ use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Request\WebRequest; use Psr\Log\LoggerInterface; use User; -use WebRequest; use Wikimedia\AtEase\AtEase; /** diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php index fbd60ac3cf00..3a7a4e010b5e 100644 --- a/includes/session/SessionManager.php +++ b/includes/session/SessionManager.php @@ -32,12 +32,12 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\User\UserNameUtils; use MWException; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; use User; -use WebRequest; /** * This serves as the entry point to the MediaWiki session handling system. diff --git a/includes/session/SessionManagerInterface.php b/includes/session/SessionManagerInterface.php index a5eeba882175..54574eac75ff 100644 --- a/includes/session/SessionManagerInterface.php +++ b/includes/session/SessionManagerInterface.php @@ -23,9 +23,9 @@ namespace MediaWiki\Session; +use MediaWiki\Request\WebRequest; use Psr\Log\LoggerAwareInterface; use User; -use WebRequest; /** * This exists to make IDEs happy, so they don't see the diff --git a/includes/session/SessionProvider.php b/includes/session/SessionProvider.php index 1b6edfdb14cb..cb50f73c2166 100644 --- a/includes/session/SessionProvider.php +++ b/includes/session/SessionProvider.php @@ -28,10 +28,10 @@ use Language; use MediaWiki\HookContainer\HookContainer; use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; +use MediaWiki\Request\WebRequest; use MediaWiki\User\UserNameUtils; use Psr\Log\LoggerInterface; use User; -use WebRequest; /** * A SessionProvider provides SessionInfo and support for Session |