Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Avoid/Replace usage of deprecated wfMemcKey() function"

Browse source
This commit is contained in:
jenkins-bot 2019-05-03 19:27:23 +00:00 committed by Gerrit Code Review
commit 94b9ae422b
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/cache/CacheHelper.php vendored
View file

@ -288,7 +288,9 @@ class CacheHelper implements ICacheHelper {
throw new MWException( 'No cache key set, so cannot obtain or save the CacheHelper values.' );
}
return wfMemcKey( ...array_values( $this->cacheKey ) );
return ObjectCache::getLocalClusterInstance()->makeKey(
...array_values( $this->cacheKey )
);
}
/**

4
includes/poolcounter/PoolWorkArticleView.php
View file

@ -114,7 +114,9 @@ class PoolWorkArticleView extends PoolCounterWork {
$this->revision = $revision;
$this->audience = $audience;
$this->cacheKey = $this->parserCache->getKey( $page, $parserOptions );
$keyPrefix = $this->cacheKey ?: wfMemcKey( 'articleview', 'missingcachekey' );
$keyPrefix = $this->cacheKey ?: ObjectCache::getLocalClusterInstance()->makeKey(
'articleview', 'missingcachekey'
);
parent::__construct( 'ArticleView', $keyPrefix . ':revid:' . $revid );
}

4
tests/phpunit/includes/auth/AuthManagerTest.php
View file

@ -2670,7 +2670,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
// Test backoff
$cache = \ObjectCache::getLocalClusterInstance();
$backoffKey = wfMemcKey( 'AuthManager', 'autocreate-failed', md5( $username ) );
$backoffKey = $cache->makeKey( 'AuthManager', 'autocreate-failed', md5( $username ) );
$cache->set( $backoffKey, true );
$session->clear();
$user = \User::newFromName( $username );
@ -2709,7 +2709,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
// Test addToDatabase throws an exception
$cache = \ObjectCache::getLocalClusterInstance();
$backoffKey = wfMemcKey( 'AuthManager', 'autocreate-failed', md5( $username ) );
$backoffKey = $cache->makeKey( 'AuthManager', 'autocreate-failed', md5( $username ) );
$this->assertFalse( $cache->get( $backoffKey ), 'sanity check' );
$session->clear();
$user = $this->getMockBuilder( \User::class )