@@ -30,9 +30,9 @@ |
||
30 | 30 | namespace OCA\FullTextSearch_ElasticSearch\Service; |
31 | 31 | |
32 | 32 | interface IUserStoragesService { |
33 | - /** |
|
34 | - * Returns an array of strings with all external mountpoints of the current user |
|
35 | - * @return array |
|
36 | - */ |
|
37 | - function getAllStoragesForUser(); |
|
33 | + /** |
|
34 | + * Returns an array of strings with all external mountpoints of the current user |
|
35 | + * @return array |
|
36 | + */ |
|
37 | + function getAllStoragesForUser(); |
|
38 | 38 | } |
39 | 39 | \ No newline at end of file |
@@ -59,13 +59,13 @@ |
||
59 | 59 | $this->registerServices(); |
60 | 60 | } |
61 | 61 | |
62 | - private function registerServices(){ |
|
62 | + private function registerServices() { |
|
63 | 63 | $container = $this->getContainer(); |
64 | 64 | |
65 | 65 | // Make SearchMappingService also work without external storage |
66 | 66 | // if app is inactive or not installed. |
67 | 67 | $container->registerService(SearchMappingService::class, function($c) { |
68 | - try{ |
|
68 | + try { |
|
69 | 69 | $userStoragesService = $c->query(UserGlobalStoragesService::class); |
70 | 70 | return new SearchMappingService( |
71 | 71 | $c->query(ConfigService::class), |
@@ -72,8 +72,7 @@ |
||
72 | 72 | $c->query(MiscService::class), |
73 | 73 | new UserStoragesService($userStoragesService) |
74 | 74 | ); |
75 | - } |
|
76 | - catch (QueryException $e) { |
|
75 | + } catch (QueryException $e) { |
|
77 | 76 | return new SearchMappingService( |
78 | 77 | $c->query(ConfigService::class), |
79 | 78 | $c->query(MiscService::class) |
@@ -36,19 +36,19 @@ discard block |
||
36 | 36 | */ |
37 | 37 | class UserStoragesService implements IUserStoragesService { |
38 | 38 | |
39 | - /** @var UserGlobalStoragesService */ |
|
40 | - private $userGlobalStoragesService; |
|
39 | + /** @var UserGlobalStoragesService */ |
|
40 | + private $userGlobalStoragesService; |
|
41 | 41 | |
42 | - public function __construct(UserGlobalStoragesService $userGlobalStoragesService) { |
|
43 | - $this->userGlobalStoragesService = $userGlobalStoragesService; |
|
44 | - } |
|
42 | + public function __construct(UserGlobalStoragesService $userGlobalStoragesService) { |
|
43 | + $this->userGlobalStoragesService = $userGlobalStoragesService; |
|
44 | + } |
|
45 | 45 | |
46 | 46 | /** |
47 | - * Returns an array of strings with all external mountpoints of the current user |
|
48 | - * @return array |
|
49 | - */ |
|
50 | - public function getAllStoragesForUser() { |
|
51 | - $userStorages = $this->userGlobalStoragesService->getAllStoragesForUser(); |
|
47 | + * Returns an array of strings with all external mountpoints of the current user |
|
48 | + * @return array |
|
49 | + */ |
|
50 | + public function getAllStoragesForUser() { |
|
51 | + $userStorages = $this->userGlobalStoragesService->getAllStoragesForUser(); |
|
52 | 52 | $mountPoints = []; |
53 | 53 | foreach($userStorages as $userStorage){ |
54 | 54 | /** @var $userStorage OCA\Files_External\Lib\StorageConfig */ |
@@ -62,5 +62,5 @@ discard block |
||
62 | 62 | $mountPoints[] = $mountPoint; |
63 | 63 | } |
64 | 64 | return $mountPoints; |
65 | - } |
|
65 | + } |
|
66 | 66 | } |
67 | 67 | \ No newline at end of file |
@@ -50,13 +50,13 @@ |
||
50 | 50 | public function getAllStoragesForUser() { |
51 | 51 | $userStorages = $this->userGlobalStoragesService->getAllStoragesForUser(); |
52 | 52 | $mountPoints = []; |
53 | - foreach($userStorages as $userStorage){ |
|
53 | + foreach ($userStorages as $userStorage) { |
|
54 | 54 | /** @var $userStorage OCA\Files_External\Lib\StorageConfig */ |
55 | 55 | $mountPoint = $userStorage->getMountPoint(); |
56 | - if (substr($mountPoint, 0, 1) === '/'){ |
|
56 | + if (substr($mountPoint, 0, 1) === '/') { |
|
57 | 57 | $mountPoint = substr($mountPoint, 1, strlen($mountPoint) - 1); |
58 | 58 | } |
59 | - if (substr($mountPoint, strlen($mountPoint) - 1, 1) !== '/'){ |
|
59 | + if (substr($mountPoint, strlen($mountPoint) - 1, 1) !== '/') { |
|
60 | 60 | $mountPoint .= '/'; |
61 | 61 | } |
62 | 62 | $mountPoints[] = $mountPoint; |