X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fsession%2FTestBagOStuff.php;h=f9e30f06ab78c861c624eba26bbb5e66391dc8f9;hb=e55888be363ad07d5817bd383b8078064ef0d36f;hp=fd02a2e9c6271abfc46d9fb29baf42180770e20d;hpb=b5e0337ddb857bf2f7a37aa7b7ba1b081a578e8c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/session/TestBagOStuff.php b/tests/phpunit/includes/session/TestBagOStuff.php
index fd02a2e9c6..f9e30f06ab 100644
--- a/tests/phpunit/includes/session/TestBagOStuff.php
+++ b/tests/phpunit/includes/session/TestBagOStuff.php
@@ -14,53 +14,44 @@ class TestBagOStuff extends \CachedBagOStuff {
 	/**
 	 * @param string $id Session ID
 	 * @param array $data Session data
-	 * @param int $expiry Expiry
-	 * @param User $user User for metadata
 	 */
-	public function setSessionData( $id, array $data, $expiry = 0, User $user = null ) {
-		$this->setSession( $id, [ 'data' => $data ], $expiry, $user );
+	public function setSessionData( $id, array $data ) {
+		$this->setSession( $id, [ 'data' => $data ] );
 	}
 
 	/**
 	 * @param string $id Session ID
 	 * @param array $metadata Session metadata
-	 * @param int $expiry Expiry
 	 */
-	public function setSessionMeta( $id, array $metadata, $expiry = 0 ) {
-		$this->setSession( $id, [ 'metadata' => $metadata ], $expiry );
+	public function setSessionMeta( $id, array $metadata ) {
+		$this->setSession( $id, [ 'metadata' => $metadata ] );
 	}
 
 	/**
 	 * @param string $id Session ID
 	 * @param array $blob Session metadata and data
-	 * @param int $expiry Expiry
-	 * @param User $user User for metadata
 	 */
-	public function setSession( $id, array $blob, $expiry = 0, User $user = null ) {
+	public function setSession( $id, array $blob ) {
 		$blob += [
 			'data' => [],
 			'metadata' => [],
 		];
 		$blob['metadata'] += [
-			'userId' => $user ? $user->getId() : 0,
-			'userName' => $user ? $user->getName() : null,
-			'userToken' => $user ? $user->getToken( true ) : null,
+			'userId' => 0,
+			'userName' => null,
+			'userToken' => null,
 			'provider' => 'DummySessionProvider',
 		];
 
-		$this->setRawSession( $id, $blob, $expiry, $user );
+		$this->setRawSession( $id, $blob );
 	}
 
 	/**
 	 * @param string $id Session ID
 	 * @param array|mixed $blob Session metadata and data
-	 * @param int $expiry Expiry
 	 */
-	public function setRawSession( $id, $blob, $expiry = 0 ) {
-		if ( $expiry <= 0 ) {
-			$expiry = \RequestContext::getMain()->getConfig()->get( 'ObjectCacheSessionExpiry' );
-		}
-
+	public function setRawSession( $id, $blob ) {
+		$expiry = \RequestContext::getMain()->getConfig()->get( 'ObjectCacheSessionExpiry' );
 		$this->set( $this->makeKey( 'MWSession', $id ), $blob, $expiry );
 	}