Skip to content
Snippets Groups Projects
Unverified Commit e03e4921 authored by Roeland Jago Douma's avatar Roeland Jago Douma
Browse files

Fix Name

parent 7ef21b0b
No related branches found
No related tags found
No related merge requests found
...@@ -72,3 +72,7 @@ Options -Indexes ...@@ -72,3 +72,7 @@ Options -Indexes
<IfModule pagespeed_module> <IfModule pagespeed_module>
ModPagespeed Off ModPagespeed Off
</IfModule> </IfModule>
#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
ErrorDocument 403 /core/templates/403.php
ErrorDocument 404 /core/templates/404.php
...@@ -53,9 +53,9 @@ class ObjectHomeMountProvider implements IHomeMountProvider { ...@@ -53,9 +53,9 @@ class ObjectHomeMountProvider implements IHomeMountProvider {
*/ */
public function getHomeMountForUser(IUser $user, IStorageFactory $loader) { public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
$config = $this->multiBucketObjectStore($user); $config = $this->getMultiBucketObjectStoreConfig($user);
if ($config === null) { if ($config === null) {
$config = $this->singleBucketObjectStore($user); $config = $this->getSingleBucketObjectStoreConfig($user);
} }
if ($config === null) { if ($config === null) {
...@@ -69,7 +69,7 @@ class ObjectHomeMountProvider implements IHomeMountProvider { ...@@ -69,7 +69,7 @@ class ObjectHomeMountProvider implements IHomeMountProvider {
* @param IUser $user * @param IUser $user
* @return array|null * @return array|null
*/ */
private function singleBucketObjectStore(IUser $user) { private function getSingleBucketObjectStoreConfig(IUser $user) {
$config = $this->config->getSystemValue('objectstore'); $config = $this->config->getSystemValue('objectstore');
if (!is_array($config)) { if (!is_array($config)) {
return null; return null;
...@@ -93,7 +93,7 @@ class ObjectHomeMountProvider implements IHomeMountProvider { ...@@ -93,7 +93,7 @@ class ObjectHomeMountProvider implements IHomeMountProvider {
* @param IUser $user * @param IUser $user
* @return array|null * @return array|null
*/ */
private function multiBucketObjectStore(IUser $user) { private function getMultiBucketObjectStoreConfig(IUser $user) {
$config = $this->config->getSystemValue('objectstore_multibucket'); $config = $this->config->getSystemValue('objectstore_multibucket');
if (!is_array($config)) { if (!is_array($config)) {
return null; return null;
......
...@@ -42,7 +42,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase { ...@@ -42,7 +42,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
$this->user->expects($this->never())->method($this->anything()); $this->user->expects($this->never())->method($this->anything());
$this->loader->expects($this->never())->method($this->anything()); $this->loader->expects($this->never())->method($this->anything());
$config = $this->invokePrivate($this->provider, 'singleBucketObjectStore', [$this->user, $this->loader]); $config = $this->invokePrivate($this->provider, 'getSingleBucketObjectStoreConfig', [$this->user, $this->loader]);
$this->assertArrayHasKey('class', $config); $this->assertArrayHasKey('class', $config);
$this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore'); $this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore');
...@@ -66,7 +66,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase { ...@@ -66,7 +66,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
->willReturn('uid'); ->willReturn('uid');
$this->loader->expects($this->never())->method($this->anything()); $this->loader->expects($this->never())->method($this->anything());
$config = $this->invokePrivate($this->provider, 'multiBucketObjectStore', [$this->user, $this->loader]); $config = $this->invokePrivate($this->provider, 'getMultiBucketObjectStoreConfig', [$this->user, $this->loader]);
$this->assertArrayHasKey('class', $config); $this->assertArrayHasKey('class', $config);
$this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore'); $this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore');
...@@ -95,7 +95,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase { ...@@ -95,7 +95,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
->willReturn('uid'); ->willReturn('uid');
$this->loader->expects($this->never())->method($this->anything()); $this->loader->expects($this->never())->method($this->anything());
$config = $this->invokePrivate($this->provider, 'multiBucketObjectStore', [$this->user, $this->loader]); $config = $this->invokePrivate($this->provider, 'getMultiBucketObjectStoreConfig', [$this->user, $this->loader]);
$this->assertArrayHasKey('class', $config); $this->assertArrayHasKey('class', $config);
$this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore'); $this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment