From 5ce943aa8501d6a7240175a934858c26f267f7ca Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 15 Dec 2017 10:48:48 +0100 Subject: [PATCH 1/3] don't use deprecated method for requesting memcache Signed-off-by: Arthur Schiwon --- apps/user_ldap/lib/Connection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php index 1dcf9b72d7..bde489e271 100644 --- a/apps/user_ldap/lib/Connection.php +++ b/apps/user_ldap/lib/Connection.php @@ -100,7 +100,7 @@ class Connection extends LDAPUtility { !is_null($configID)); $memcache = \OC::$server->getMemCacheFactory(); if($memcache->isAvailable()) { - $this->cache = $memcache->create(); + $this->cache = $memcache->createDistributed(); } $helper = new Helper(\OC::$server->getConfig()); $this->doNotValidate = !in_array($this->configPrefix, From d2d73f1ce8733623a780db62427c61ff007b33cb Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 15 Dec 2017 11:31:13 +0100 Subject: [PATCH 2/3] Also replace all other occurences Signed-off-by: Morris Jobke --- apps/files_sharing/lib/External/Storage.php | 2 +- apps/theming/lib/ThemingDefaults.php | 6 +++--- apps/user_ldap/lib/Proxy.php | 2 +- core/Command/Maintenance/UpdateTheme.php | 2 +- lib/private/App/AppManager.php | 2 +- lib/private/Files/ObjectStore/Swift.php | 2 +- lib/private/IntegrityCheck/Checker.php | 2 +- lib/private/OCS/DiscoveryService.php | 2 +- lib/private/Security/RateLimiting/Backend/MemoryCache.php | 2 +- lib/private/Server.php | 2 +- lib/private/TemplateLayout.php | 2 +- lib/private/URLGenerator.php | 2 +- lib/private/legacy/helper.php | 2 +- settings/ajax/uninstallapp.php | 4 ++-- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php index bae24e89e6..638f82f702 100644 --- a/apps/files_sharing/lib/External/Storage.php +++ b/apps/files_sharing/lib/External/Storage.php @@ -261,7 +261,7 @@ class Storage extends DAV implements ISharedStorage { * @return bool */ private function testRemoteUrl($url) { - $cache = $this->memcacheFactory->create('files_sharing_remote_url'); + $cache = $this->memcacheFactory->createDistributed('files_sharing_remote_url'); if($cache->hasKey($url)) { return (bool)$cache->get($url); } diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index fa43dd50cc..05d387e627 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -240,7 +240,7 @@ class ThemingDefaults extends \OC_Defaults { * @return array scss variables to overwrite */ public function getScssVariables() { - $cache = $this->cacheFactory->create('theming'); + $cache = $this->cacheFactory->createDistributed('theming'); if ($value = $cache->get('getScssVariables')) { return $value; } @@ -307,7 +307,7 @@ class ThemingDefaults extends \OC_Defaults { * @return bool */ public function shouldReplaceIcons() { - $cache = $this->cacheFactory->create('theming'); + $cache = $this->cacheFactory->createDistributed('theming'); if($value = $cache->get('shouldReplaceIcons')) { return (bool)$value; } @@ -329,7 +329,7 @@ class ThemingDefaults extends \OC_Defaults { private function increaseCacheBuster() { $cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0'); $this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1); - $this->cacheFactory->create('theming')->clear('getScssVariables'); + $this->cacheFactory->createDistributed('theming')->clear('getScssVariables'); } /** diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php index d372ff9c02..dc8c6fc77c 100644 --- a/apps/user_ldap/lib/Proxy.php +++ b/apps/user_ldap/lib/Proxy.php @@ -50,7 +50,7 @@ abstract class Proxy { $this->ldap = $ldap; $memcache = \OC::$server->getMemCacheFactory(); if($memcache->isAvailable()) { - $this->cache = $memcache->create(); + $this->cache = $memcache->createDistributed(); } } diff --git a/core/Command/Maintenance/UpdateTheme.php b/core/Command/Maintenance/UpdateTheme.php index cf015b8263..2ab66a4ce7 100644 --- a/core/Command/Maintenance/UpdateTheme.php +++ b/core/Command/Maintenance/UpdateTheme.php @@ -57,7 +57,7 @@ class UpdateTheme extends UpdateJS { parent::execute($input, $output); // cleanup image cache - $c = $this->cacheFactory->create('imagePath'); + $c = $this->cacheFactory->createDistributed('imagePath'); $c->clear(''); $output->writeln('Image cache cleared'); } diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 6be892b7f4..e7d4668931 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -306,7 +306,7 @@ class AppManager implements IAppManager { * Clear the cached list of apps when enabling/disabling an app */ public function clearAppsCache() { - $settingsMemCache = $this->memCacheFactory->create('settings'); + $settingsMemCache = $this->memCacheFactory->createDistributed('settings'); $settingsMemCache->clear('listApps'); } diff --git a/lib/private/Files/ObjectStore/Swift.php b/lib/private/Files/ObjectStore/Swift.php index ecfbe136e4..629fb3ba7f 100644 --- a/lib/private/Files/ObjectStore/Swift.php +++ b/lib/private/Files/ObjectStore/Swift.php @@ -82,7 +82,7 @@ class Swift implements IObjectStore { } $cacheFactory = \OC::$server->getMemCacheFactory(); - $this->memcache = $cacheFactory->create('swift::' . $cacheKey); + $this->memcache = $cacheFactory->createDistributed('swift::' . $cacheKey); $this->params = $params; } diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index ee7e35550a..771ac891ab 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -87,7 +87,7 @@ class Checker { $this->fileAccessHelper = $fileAccessHelper; $this->appLocator = $appLocator; $this->config = $config; - $this->cache = $cacheFactory->create(self::CACHE_KEY); + $this->cache = $cacheFactory->createDistributed(self::CACHE_KEY); $this->appManager = $appManager; $this->tempManager = $tempManager; } diff --git a/lib/private/OCS/DiscoveryService.php b/lib/private/OCS/DiscoveryService.php index e547747da2..4425947c55 100644 --- a/lib/private/OCS/DiscoveryService.php +++ b/lib/private/OCS/DiscoveryService.php @@ -46,7 +46,7 @@ class DiscoveryService implements IDiscoveryService { public function __construct(ICacheFactory $cacheFactory, IClientService $clientService ) { - $this->cache = $cacheFactory->create('ocs-discovery'); + $this->cache = $cacheFactory->createDistributed('ocs-discovery'); $this->client = $clientService->newClient(); } diff --git a/lib/private/Security/RateLimiting/Backend/MemoryCache.php b/lib/private/Security/RateLimiting/Backend/MemoryCache.php index 212df664c1..700fa624ed 100644 --- a/lib/private/Security/RateLimiting/Backend/MemoryCache.php +++ b/lib/private/Security/RateLimiting/Backend/MemoryCache.php @@ -45,7 +45,7 @@ class MemoryCache implements IBackend { */ public function __construct(ICacheFactory $cacheFactory, ITimeFactory $timeFactory) { - $this->cache = $cacheFactory->create(__CLASS__); + $this->cache = $cacheFactory->createDistributed(__CLASS__); $this->timeFactory = $timeFactory; } diff --git a/lib/private/Server.php b/lib/private/Server.php index 6898e93e3b..8560ce1292 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -952,7 +952,7 @@ class Server extends ServerContainer implements IServerContainer { $c->getConfig(), $c->getThemingDefaults(), \OC::$SERVERROOT, - $cacheFactory->create('SCSS') + $cacheFactory->createDistributed('SCSS') ); }); $this->registerService(EventDispatcher::class, function () { diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 997980aa5d..264c10f5f1 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -291,7 +291,7 @@ class TemplateLayout extends \OC_Template { new JSCombiner( \OC::$server->getAppDataDir('js'), \OC::$server->getURLGenerator(), - \OC::$server->getMemCacheFactory()->create('JS'), + \OC::$server->getMemCacheFactory()->createDistributed('JS'), \OC::$server->getSystemConfig(), \OC::$server->getLogger() ) diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index 6fd22b99a6..f7d80d41b4 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -151,7 +151,7 @@ class URLGenerator implements IURLGenerator { * Returns the path to the image. */ public function imagePath($app, $image) { - $cache = $this->cacheFactory->create('imagePath-'.md5($this->getBaseUrl()).'-'); + $cache = $this->cacheFactory->createDistributed('imagePath-'.md5($this->getBaseUrl()).'-'); $cacheKey = $app.'-'.$image; if($key = $cache->get($cacheKey)) { return $key; diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index e611b4d073..8bbfb235ee 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -497,7 +497,7 @@ class OC_Helper { * @return null|string */ public static function findBinaryPath($program) { - $memcache = \OC::$server->getMemCacheFactory()->create('findBinaryPath'); + $memcache = \OC::$server->getMemCacheFactory()->createDistributed('findBinaryPath'); if ($memcache->hasKey($program)) { return $memcache->get($program); } diff --git a/settings/ajax/uninstallapp.php b/settings/ajax/uninstallapp.php index b4a2468bd2..a932e2d79e 100644 --- a/settings/ajax/uninstallapp.php +++ b/settings/ajax/uninstallapp.php @@ -43,8 +43,8 @@ $appId = OC_App::cleanAppId($appId); $result = OC_App::removeApp($appId); if($result !== false) { // FIXME: Clear the cache - move that into some sane helper method - \OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-0'); - \OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-1'); + \OC::$server->getMemCacheFactory()->createDistributed('settings')->remove('listApps-0'); + \OC::$server->getMemCacheFactory()->createDistributed('settings')->remove('listApps-1'); OC_JSON::success(array('data' => array('appid' => $appId))); } else { $l = \OC::$server->getL10N('settings'); From 094d41937a5889e4c545ecf575aa1acbcf489a55 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 18 Dec 2017 21:06:52 +0100 Subject: [PATCH 3/3] Fix tests Signed-off-by: Roeland Jago Douma --- apps/theming/tests/ThemingDefaultsTest.php | 2 +- tests/Core/Command/Maintenance/UpdateTheme.php | 2 +- tests/lib/App/AppManagerTest.php | 2 +- tests/lib/IntegrityCheck/CheckerTest.php | 2 +- tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index 52bf88e51d..843c1d34f9 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -78,7 +78,7 @@ class ThemingDefaultsTest extends TestCase { $this->defaults = new \OC_Defaults(); $this->cacheFactory ->expects($this->any()) - ->method('create') + ->method('createDistributed') ->with('theming') ->willReturn($this->cache); $this->template = new ThemingDefaults( diff --git a/tests/Core/Command/Maintenance/UpdateTheme.php b/tests/Core/Command/Maintenance/UpdateTheme.php index fbdea0b72b..cbc417dbdb 100644 --- a/tests/Core/Command/Maintenance/UpdateTheme.php +++ b/tests/Core/Command/Maintenance/UpdateTheme.php @@ -74,7 +74,7 @@ class UpdateThemeTest extends TestCase { ->method('clear') ->with(''); $this->cacheFactory->expects($this->once()) - ->method('create') + ->method('createDistributed') ->with('imagePath') ->willReturn($cache); self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index c2c0ea5507..c361db7b76 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -100,7 +100,7 @@ class AppManagerTest extends TestCase { $this->cache = $this->createMock(ICache::class); $this->eventDispatcher = $this->createMock(EventDispatcherInterface::class); $this->cacheFactory->expects($this->any()) - ->method('create') + ->method('createDistributed') ->with('settings') ->willReturn($this->cache); $this->manager = new AppManager($this->userSession, $this->appConfig, $this->groupManager, $this->cacheFactory, $this->eventDispatcher); diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php index 049017cb5e..09e6990a0f 100644 --- a/tests/lib/IntegrityCheck/CheckerTest.php +++ b/tests/lib/IntegrityCheck/CheckerTest.php @@ -60,7 +60,7 @@ class CheckerTest extends TestCase { $this->cacheFactory ->expects($this->any()) - ->method('create') + ->method('createDistributed') ->with('oc.integritycheck.checker') ->will($this->returnValue(new NullCache())); diff --git a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php index 34c326e72e..bacd2b7bf6 100644 --- a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php +++ b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php @@ -46,7 +46,7 @@ class MemoryCacheTest extends TestCase { $this->cacheFactory ->expects($this->once()) - ->method('create') + ->method('createDistributed') ->with('OC\Security\RateLimiting\Backend\MemoryCache') ->willReturn($this->cache);