From f039ba748032a78e70845adad9152730715a8219 Mon Sep 17 00:00:00 2001 From: Julius Härtl <jus@bitgrid.net> Date: Thu, 15 Jun 2017 21:51:51 +0200 Subject: Add tests and inject IRequest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl <jus@bitgrid.net> --- lib/private/Server.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/private/Server.php') diff --git a/lib/private/Server.php b/lib/private/Server.php index 159fab20be4..489683aa127 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -414,9 +414,11 @@ class Server extends ServerContainer implements IServerContainer { $this->registerService(\OCP\IURLGenerator::class, function (Server $c) { $config = $c->getConfig(); $cacheFactory = $c->getMemCacheFactory(); + $request = $c->getRequest(); return new \OC\URLGenerator( $config, - $cacheFactory + $cacheFactory, + $request ); }); $this->registerAlias('URLGenerator', \OCP\IURLGenerator::class); @@ -433,13 +435,15 @@ class Server extends ServerContainer implements IServerContainer { $this->registerAlias('UserCache', \OCP\ICache::class); $this->registerService(Factory::class, function (Server $c) { + $arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(), '\\OC\\Memcache\\ArrayCache', '\\OC\\Memcache\\ArrayCache', '\\OC\\Memcache\\ArrayCache' ); $config = $c->getConfig(); - $urlGenerator = new URLGenerator($config, $arrayCacheFactory); + $request = $c->getRequest(); + $urlGenerator = new URLGenerator($config, $arrayCacheFactory, $request); if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { $v = \OC_App::getAppVersions(); -- cgit v1.2.3