@@ -13,74 +13,74 @@ |
||
13 | 13 | use OCP\Share\IManager; |
14 | 14 | |
15 | 15 | class ShareInfoMiddleware extends Middleware { |
16 | - /** @var IManager */ |
|
17 | - private $shareManager; |
|
16 | + /** @var IManager */ |
|
17 | + private $shareManager; |
|
18 | 18 | |
19 | - public function __construct(IManager $shareManager) { |
|
20 | - $this->shareManager = $shareManager; |
|
21 | - } |
|
19 | + public function __construct(IManager $shareManager) { |
|
20 | + $this->shareManager = $shareManager; |
|
21 | + } |
|
22 | 22 | |
23 | - /** |
|
24 | - * @param Controller $controller |
|
25 | - * @param string $methodName |
|
26 | - * @throws S2SException |
|
27 | - */ |
|
28 | - public function beforeController($controller, $methodName) { |
|
29 | - if (!($controller instanceof ShareInfoController)) { |
|
30 | - return; |
|
31 | - } |
|
23 | + /** |
|
24 | + * @param Controller $controller |
|
25 | + * @param string $methodName |
|
26 | + * @throws S2SException |
|
27 | + */ |
|
28 | + public function beforeController($controller, $methodName) { |
|
29 | + if (!($controller instanceof ShareInfoController)) { |
|
30 | + return; |
|
31 | + } |
|
32 | 32 | |
33 | - if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) { |
|
34 | - throw new S2SException(); |
|
35 | - } |
|
36 | - } |
|
33 | + if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) { |
|
34 | + throw new S2SException(); |
|
35 | + } |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param Controller $controller |
|
40 | - * @param string $methodName |
|
41 | - * @param \Exception $exception |
|
42 | - * @throws \Exception |
|
43 | - * @return Response |
|
44 | - */ |
|
45 | - public function afterException($controller, $methodName, \Exception $exception) { |
|
46 | - if (!($controller instanceof ShareInfoController)) { |
|
47 | - throw $exception; |
|
48 | - } |
|
38 | + /** |
|
39 | + * @param Controller $controller |
|
40 | + * @param string $methodName |
|
41 | + * @param \Exception $exception |
|
42 | + * @throws \Exception |
|
43 | + * @return Response |
|
44 | + */ |
|
45 | + public function afterException($controller, $methodName, \Exception $exception) { |
|
46 | + if (!($controller instanceof ShareInfoController)) { |
|
47 | + throw $exception; |
|
48 | + } |
|
49 | 49 | |
50 | - if ($exception instanceof S2SException) { |
|
51 | - return new JSONResponse([], Http::STATUS_NOT_FOUND); |
|
52 | - } |
|
50 | + if ($exception instanceof S2SException) { |
|
51 | + return new JSONResponse([], Http::STATUS_NOT_FOUND); |
|
52 | + } |
|
53 | 53 | |
54 | - throw $exception; |
|
55 | - } |
|
54 | + throw $exception; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * @param Controller $controller |
|
59 | - * @param string $methodName |
|
60 | - * @param Response $response |
|
61 | - * @return Response |
|
62 | - */ |
|
63 | - public function afterController($controller, $methodName, Response $response) { |
|
64 | - if (!($controller instanceof ShareInfoController)) { |
|
65 | - return $response; |
|
66 | - } |
|
57 | + /** |
|
58 | + * @param Controller $controller |
|
59 | + * @param string $methodName |
|
60 | + * @param Response $response |
|
61 | + * @return Response |
|
62 | + */ |
|
63 | + public function afterController($controller, $methodName, Response $response) { |
|
64 | + if (!($controller instanceof ShareInfoController)) { |
|
65 | + return $response; |
|
66 | + } |
|
67 | 67 | |
68 | - if (!($response instanceof JSONResponse)) { |
|
69 | - return $response; |
|
70 | - } |
|
68 | + if (!($response instanceof JSONResponse)) { |
|
69 | + return $response; |
|
70 | + } |
|
71 | 71 | |
72 | - $data = $response->getData(); |
|
73 | - $status = 'error'; |
|
72 | + $data = $response->getData(); |
|
73 | + $status = 'error'; |
|
74 | 74 | |
75 | - if ($response->getStatus() === Http::STATUS_OK) { |
|
76 | - $status = 'success'; |
|
77 | - } |
|
75 | + if ($response->getStatus() === Http::STATUS_OK) { |
|
76 | + $status = 'success'; |
|
77 | + } |
|
78 | 78 | |
79 | - $response->setData([ |
|
80 | - 'data' => $data, |
|
81 | - 'status' => $status, |
|
82 | - ]); |
|
79 | + $response->setData([ |
|
80 | + 'data' => $data, |
|
81 | + 'status' => $status, |
|
82 | + ]); |
|
83 | 83 | |
84 | - return $response; |
|
85 | - } |
|
84 | + return $response; |
|
85 | + } |
|
86 | 86 | } |
@@ -29,32 +29,32 @@ |
||
29 | 29 | |
30 | 30 | class DropAccountTermsTable implements IRepairStep { |
31 | 31 | |
32 | - /** @var IDBConnection */ |
|
33 | - protected $db; |
|
34 | - |
|
35 | - /** |
|
36 | - * @param IDBConnection $db |
|
37 | - */ |
|
38 | - public function __construct(IDBConnection $db) { |
|
39 | - $this->db = $db; |
|
40 | - } |
|
41 | - |
|
42 | - /** |
|
43 | - * @return string |
|
44 | - */ |
|
45 | - public function getName() { |
|
46 | - return 'Drop account terms table when migrating from ownCloud'; |
|
47 | - } |
|
48 | - |
|
49 | - /** |
|
50 | - * @param IOutput $output |
|
51 | - */ |
|
52 | - public function run(IOutput $output) { |
|
53 | - if (!$this->db->tableExists('account_terms')) { |
|
54 | - return; |
|
55 | - } |
|
56 | - |
|
57 | - $this->db->dropTable('account_terms'); |
|
58 | - } |
|
32 | + /** @var IDBConnection */ |
|
33 | + protected $db; |
|
34 | + |
|
35 | + /** |
|
36 | + * @param IDBConnection $db |
|
37 | + */ |
|
38 | + public function __construct(IDBConnection $db) { |
|
39 | + $this->db = $db; |
|
40 | + } |
|
41 | + |
|
42 | + /** |
|
43 | + * @return string |
|
44 | + */ |
|
45 | + public function getName() { |
|
46 | + return 'Drop account terms table when migrating from ownCloud'; |
|
47 | + } |
|
48 | + |
|
49 | + /** |
|
50 | + * @param IOutput $output |
|
51 | + */ |
|
52 | + public function run(IOutput $output) { |
|
53 | + if (!$this->db->tableExists('account_terms')) { |
|
54 | + return; |
|
55 | + } |
|
56 | + |
|
57 | + $this->db->dropTable('account_terms'); |
|
58 | + } |
|
59 | 59 | } |
60 | 60 |
@@ -29,48 +29,48 @@ |
||
29 | 29 | */ |
30 | 30 | class ExpireSharesJob extends TimedJob { |
31 | 31 | |
32 | - /** |
|
33 | - * sets the correct interval for this timed job |
|
34 | - */ |
|
35 | - public function __construct() { |
|
36 | - // Run once a day |
|
37 | - $this->setInterval(24 * 60 * 60); |
|
38 | - } |
|
32 | + /** |
|
33 | + * sets the correct interval for this timed job |
|
34 | + */ |
|
35 | + public function __construct() { |
|
36 | + // Run once a day |
|
37 | + $this->setInterval(24 * 60 * 60); |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Makes the background job do its work |
|
42 | - * |
|
43 | - * @param array $argument unused argument |
|
44 | - */ |
|
45 | - public function run($argument) { |
|
46 | - $connection = \OC::$server->getDatabaseConnection(); |
|
40 | + /** |
|
41 | + * Makes the background job do its work |
|
42 | + * |
|
43 | + * @param array $argument unused argument |
|
44 | + */ |
|
45 | + public function run($argument) { |
|
46 | + $connection = \OC::$server->getDatabaseConnection(); |
|
47 | 47 | |
48 | - //Current time |
|
49 | - $now = new \DateTime(); |
|
50 | - $now = $now->format('Y-m-d H:i:s'); |
|
48 | + //Current time |
|
49 | + $now = new \DateTime(); |
|
50 | + $now = $now->format('Y-m-d H:i:s'); |
|
51 | 51 | |
52 | - /* |
|
52 | + /* |
|
53 | 53 | * Expire file link shares only (for now) |
54 | 54 | */ |
55 | - $qb = $connection->getQueryBuilder(); |
|
56 | - $qb->select('id', 'file_source', 'uid_owner', 'item_type') |
|
57 | - ->from('share') |
|
58 | - ->where( |
|
59 | - $qb->expr()->andX( |
|
60 | - $qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)), |
|
61 | - $qb->expr()->lte('expiration', $qb->expr()->literal($now)), |
|
62 | - $qb->expr()->orX( |
|
63 | - $qb->expr()->eq('item_type', $qb->expr()->literal('file')), |
|
64 | - $qb->expr()->eq('item_type', $qb->expr()->literal('folder')) |
|
65 | - ) |
|
66 | - ) |
|
67 | - ); |
|
55 | + $qb = $connection->getQueryBuilder(); |
|
56 | + $qb->select('id', 'file_source', 'uid_owner', 'item_type') |
|
57 | + ->from('share') |
|
58 | + ->where( |
|
59 | + $qb->expr()->andX( |
|
60 | + $qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)), |
|
61 | + $qb->expr()->lte('expiration', $qb->expr()->literal($now)), |
|
62 | + $qb->expr()->orX( |
|
63 | + $qb->expr()->eq('item_type', $qb->expr()->literal('file')), |
|
64 | + $qb->expr()->eq('item_type', $qb->expr()->literal('folder')) |
|
65 | + ) |
|
66 | + ) |
|
67 | + ); |
|
68 | 68 | |
69 | - $shares = $qb->execute(); |
|
70 | - while($share = $shares->fetch()) { |
|
71 | - \OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']); |
|
72 | - } |
|
73 | - $shares->closeCursor(); |
|
74 | - } |
|
69 | + $shares = $qb->execute(); |
|
70 | + while($share = $shares->fetch()) { |
|
71 | + \OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']); |
|
72 | + } |
|
73 | + $shares->closeCursor(); |
|
74 | + } |
|
75 | 75 | |
76 | 76 | } |
@@ -67,7 +67,7 @@ |
||
67 | 67 | ); |
68 | 68 | |
69 | 69 | $shares = $qb->execute(); |
70 | - while($share = $shares->fetch()) { |
|
70 | + while ($share = $shares->fetch()) { |
|
71 | 71 | \OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']); |
72 | 72 | } |
73 | 73 | $shares->closeCursor(); |
@@ -27,18 +27,18 @@ |
||
27 | 27 | */ |
28 | 28 | class InvalidAuth extends AuthMechanism { |
29 | 29 | |
30 | - /** |
|
31 | - * Constructs a new InvalidAuth with the id of the invalid auth |
|
32 | - * for display purposes |
|
33 | - * |
|
34 | - * @param string $invalidId invalid id |
|
35 | - */ |
|
36 | - public function __construct($invalidId) { |
|
37 | - $this |
|
38 | - ->setIdentifier($invalidId) |
|
39 | - ->setScheme(self::SCHEME_NULL) |
|
40 | - ->setText('Unknown auth mechanism backend ' . $invalidId) |
|
41 | - ; |
|
42 | - } |
|
30 | + /** |
|
31 | + * Constructs a new InvalidAuth with the id of the invalid auth |
|
32 | + * for display purposes |
|
33 | + * |
|
34 | + * @param string $invalidId invalid id |
|
35 | + */ |
|
36 | + public function __construct($invalidId) { |
|
37 | + $this |
|
38 | + ->setIdentifier($invalidId) |
|
39 | + ->setScheme(self::SCHEME_NULL) |
|
40 | + ->setText('Unknown auth mechanism backend ' . $invalidId) |
|
41 | + ; |
|
42 | + } |
|
43 | 43 | |
44 | 44 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | $this |
38 | 38 | ->setIdentifier($invalidId) |
39 | 39 | ->setScheme(self::SCHEME_NULL) |
40 | - ->setText('Unknown auth mechanism backend ' . $invalidId) |
|
40 | + ->setText('Unknown auth mechanism backend '.$invalidId) |
|
41 | 41 | ; |
42 | 42 | } |
43 | 43 |
@@ -26,20 +26,20 @@ |
||
26 | 26 | |
27 | 27 | interface IGroupLDAP { |
28 | 28 | |
29 | - //Used by LDAPProvider |
|
29 | + //Used by LDAPProvider |
|
30 | 30 | |
31 | - /** |
|
32 | - * Return access for LDAP interaction. |
|
33 | - * @param string $gid |
|
34 | - * @return Access instance of Access for LDAP interaction |
|
35 | - */ |
|
36 | - public function getLDAPAccess($gid); |
|
31 | + /** |
|
32 | + * Return access for LDAP interaction. |
|
33 | + * @param string $gid |
|
34 | + * @return Access instance of Access for LDAP interaction |
|
35 | + */ |
|
36 | + public function getLDAPAccess($gid); |
|
37 | 37 | |
38 | - /** |
|
39 | - * Return a new LDAP connection for the specified group. |
|
40 | - * @param string $gid |
|
41 | - * @return resource of the LDAP connection |
|
42 | - */ |
|
43 | - public function getNewLDAPConnection($gid); |
|
38 | + /** |
|
39 | + * Return a new LDAP connection for the specified group. |
|
40 | + * @param string $gid |
|
41 | + * @return resource of the LDAP connection |
|
42 | + */ |
|
43 | + public function getNewLDAPConnection($gid); |
|
44 | 44 | |
45 | 45 | } |
@@ -38,27 +38,27 @@ |
||
38 | 38 | */ |
39 | 39 | interface IApacheBackend { |
40 | 40 | |
41 | - /** |
|
42 | - * In case the user has been authenticated by a module true is returned. |
|
43 | - * |
|
44 | - * @return boolean whether the module reports a user as currently logged in. |
|
45 | - * @since 6.0.0 |
|
46 | - */ |
|
47 | - public function isSessionActive(); |
|
41 | + /** |
|
42 | + * In case the user has been authenticated by a module true is returned. |
|
43 | + * |
|
44 | + * @return boolean whether the module reports a user as currently logged in. |
|
45 | + * @since 6.0.0 |
|
46 | + */ |
|
47 | + public function isSessionActive(); |
|
48 | 48 | |
49 | - /** |
|
50 | - * Gets the current logout URL |
|
51 | - * |
|
52 | - * @return string |
|
53 | - * @since 12.0.3 |
|
54 | - */ |
|
55 | - public function getLogoutUrl(); |
|
49 | + /** |
|
50 | + * Gets the current logout URL |
|
51 | + * |
|
52 | + * @return string |
|
53 | + * @since 12.0.3 |
|
54 | + */ |
|
55 | + public function getLogoutUrl(); |
|
56 | 56 | |
57 | - /** |
|
58 | - * Return the id of the current user |
|
59 | - * @return string |
|
60 | - * @since 6.0.0 |
|
61 | - */ |
|
62 | - public function getCurrentUserId(); |
|
57 | + /** |
|
58 | + * Return the id of the current user |
|
59 | + * @return string |
|
60 | + * @since 6.0.0 |
|
61 | + */ |
|
62 | + public function getCurrentUserId(); |
|
63 | 63 | |
64 | 64 | } |
@@ -31,89 +31,89 @@ |
||
31 | 31 | * @since 9.0.0 |
32 | 32 | */ |
33 | 33 | interface IUserMountCache { |
34 | - /** |
|
35 | - * Register mounts for a user to the cache |
|
36 | - * |
|
37 | - * @param IUser $user |
|
38 | - * @param IMountPoint[] $mounts |
|
39 | - * @since 9.0.0 |
|
40 | - */ |
|
41 | - public function registerMounts(IUser $user, array $mounts); |
|
34 | + /** |
|
35 | + * Register mounts for a user to the cache |
|
36 | + * |
|
37 | + * @param IUser $user |
|
38 | + * @param IMountPoint[] $mounts |
|
39 | + * @since 9.0.0 |
|
40 | + */ |
|
41 | + public function registerMounts(IUser $user, array $mounts); |
|
42 | 42 | |
43 | - /** |
|
44 | - * Get all cached mounts for a user |
|
45 | - * |
|
46 | - * @param IUser $user |
|
47 | - * @return ICachedMountInfo[] |
|
48 | - * @since 9.0.0 |
|
49 | - */ |
|
50 | - public function getMountsForUser(IUser $user); |
|
43 | + /** |
|
44 | + * Get all cached mounts for a user |
|
45 | + * |
|
46 | + * @param IUser $user |
|
47 | + * @return ICachedMountInfo[] |
|
48 | + * @since 9.0.0 |
|
49 | + */ |
|
50 | + public function getMountsForUser(IUser $user); |
|
51 | 51 | |
52 | - /** |
|
53 | - * Get all cached mounts by storage |
|
54 | - * |
|
55 | - * @param int $numericStorageId |
|
56 | - * @param string|null $user limit the results to a single user @since 12.0.0 |
|
57 | - * @return ICachedMountInfo[] |
|
58 | - * @since 9.0.0 |
|
59 | - */ |
|
60 | - public function getMountsForStorageId($numericStorageId, $user = null); |
|
52 | + /** |
|
53 | + * Get all cached mounts by storage |
|
54 | + * |
|
55 | + * @param int $numericStorageId |
|
56 | + * @param string|null $user limit the results to a single user @since 12.0.0 |
|
57 | + * @return ICachedMountInfo[] |
|
58 | + * @since 9.0.0 |
|
59 | + */ |
|
60 | + public function getMountsForStorageId($numericStorageId, $user = null); |
|
61 | 61 | |
62 | - /** |
|
63 | - * Get all cached mounts by root |
|
64 | - * |
|
65 | - * @param int $rootFileId |
|
66 | - * @return ICachedMountInfo[] |
|
67 | - * @since 9.0.0 |
|
68 | - */ |
|
69 | - public function getMountsForRootId($rootFileId); |
|
62 | + /** |
|
63 | + * Get all cached mounts by root |
|
64 | + * |
|
65 | + * @param int $rootFileId |
|
66 | + * @return ICachedMountInfo[] |
|
67 | + * @since 9.0.0 |
|
68 | + */ |
|
69 | + public function getMountsForRootId($rootFileId); |
|
70 | 70 | |
71 | - /** |
|
72 | - * Get all cached mounts that contain a file |
|
73 | - * |
|
74 | - * @param int $fileId |
|
75 | - * @param string|null $user optionally restrict the results to a single user @since 12.0.0 |
|
76 | - * @return ICachedMountFileInfo[] |
|
77 | - * @since 9.0.0 |
|
78 | - */ |
|
79 | - public function getMountsForFileId($fileId, $user = null); |
|
71 | + /** |
|
72 | + * Get all cached mounts that contain a file |
|
73 | + * |
|
74 | + * @param int $fileId |
|
75 | + * @param string|null $user optionally restrict the results to a single user @since 12.0.0 |
|
76 | + * @return ICachedMountFileInfo[] |
|
77 | + * @since 9.0.0 |
|
78 | + */ |
|
79 | + public function getMountsForFileId($fileId, $user = null); |
|
80 | 80 | |
81 | - /** |
|
82 | - * Remove all cached mounts for a user |
|
83 | - * |
|
84 | - * @param IUser $user |
|
85 | - * @since 9.0.0 |
|
86 | - */ |
|
87 | - public function removeUserMounts(IUser $user); |
|
81 | + /** |
|
82 | + * Remove all cached mounts for a user |
|
83 | + * |
|
84 | + * @param IUser $user |
|
85 | + * @since 9.0.0 |
|
86 | + */ |
|
87 | + public function removeUserMounts(IUser $user); |
|
88 | 88 | |
89 | - /** |
|
90 | - * Remove all mounts for a user and storage |
|
91 | - * |
|
92 | - * @param $storageId |
|
93 | - * @param string $userId |
|
94 | - * @return mixed |
|
95 | - * @since 9.0.0 |
|
96 | - */ |
|
97 | - public function removeUserStorageMount($storageId, $userId); |
|
89 | + /** |
|
90 | + * Remove all mounts for a user and storage |
|
91 | + * |
|
92 | + * @param $storageId |
|
93 | + * @param string $userId |
|
94 | + * @return mixed |
|
95 | + * @since 9.0.0 |
|
96 | + */ |
|
97 | + public function removeUserStorageMount($storageId, $userId); |
|
98 | 98 | |
99 | - /** |
|
100 | - * Remove all cached mounts for a storage |
|
101 | - * |
|
102 | - * @param $storageId |
|
103 | - * @return mixed |
|
104 | - * @since 9.0.0 |
|
105 | - */ |
|
106 | - public function remoteStorageMounts($storageId); |
|
99 | + /** |
|
100 | + * Remove all cached mounts for a storage |
|
101 | + * |
|
102 | + * @param $storageId |
|
103 | + * @return mixed |
|
104 | + * @since 9.0.0 |
|
105 | + */ |
|
106 | + public function remoteStorageMounts($storageId); |
|
107 | 107 | |
108 | - /** |
|
109 | - * Get the used space for users |
|
110 | - * |
|
111 | - * Note that this only includes the space in their home directory, |
|
112 | - * not any incoming shares or external storages. |
|
113 | - * |
|
114 | - * @param IUser[] $users |
|
115 | - * @return int[] [$userId => $userSpace] |
|
116 | - * @since 13.0.0 |
|
117 | - */ |
|
118 | - public function getUsedSpaceForUsers(array $users); |
|
108 | + /** |
|
109 | + * Get the used space for users |
|
110 | + * |
|
111 | + * Note that this only includes the space in their home directory, |
|
112 | + * not any incoming shares or external storages. |
|
113 | + * |
|
114 | + * @param IUser[] $users |
|
115 | + * @return int[] [$userId => $userSpace] |
|
116 | + * @since 13.0.0 |
|
117 | + */ |
|
118 | + public function getUsedSpaceForUsers(array $users); |
|
119 | 119 | } |
@@ -29,76 +29,76 @@ |
||
29 | 29 | * Asynchronous command bus that uses the background job system as backend |
30 | 30 | */ |
31 | 31 | abstract class AsyncBus implements IBus { |
32 | - /** |
|
33 | - * List of traits for command which require sync execution |
|
34 | - * |
|
35 | - * @var string[] |
|
36 | - */ |
|
37 | - private $syncTraits = []; |
|
32 | + /** |
|
33 | + * List of traits for command which require sync execution |
|
34 | + * |
|
35 | + * @var string[] |
|
36 | + */ |
|
37 | + private $syncTraits = []; |
|
38 | 38 | |
39 | - /** |
|
40 | - * Schedule a command to be fired |
|
41 | - * |
|
42 | - * @param \OCP\Command\ICommand | callable $command |
|
43 | - */ |
|
44 | - public function push($command) { |
|
45 | - if ($this->canRunAsync($command)) { |
|
46 | - $this->queueCommand($command); |
|
47 | - } else { |
|
48 | - $this->runCommand($command); |
|
49 | - } |
|
50 | - } |
|
39 | + /** |
|
40 | + * Schedule a command to be fired |
|
41 | + * |
|
42 | + * @param \OCP\Command\ICommand | callable $command |
|
43 | + */ |
|
44 | + public function push($command) { |
|
45 | + if ($this->canRunAsync($command)) { |
|
46 | + $this->queueCommand($command); |
|
47 | + } else { |
|
48 | + $this->runCommand($command); |
|
49 | + } |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * Queue a command in the bus |
|
54 | - * |
|
55 | - * @param \OCP\Command\ICommand | callable $command |
|
56 | - */ |
|
57 | - abstract protected function queueCommand($command); |
|
52 | + /** |
|
53 | + * Queue a command in the bus |
|
54 | + * |
|
55 | + * @param \OCP\Command\ICommand | callable $command |
|
56 | + */ |
|
57 | + abstract protected function queueCommand($command); |
|
58 | 58 | |
59 | - /** |
|
60 | - * Require all commands using a trait to be run synchronous |
|
61 | - * |
|
62 | - * @param string $trait |
|
63 | - */ |
|
64 | - public function requireSync($trait) { |
|
65 | - $this->syncTraits[] = trim($trait, '\\'); |
|
66 | - } |
|
59 | + /** |
|
60 | + * Require all commands using a trait to be run synchronous |
|
61 | + * |
|
62 | + * @param string $trait |
|
63 | + */ |
|
64 | + public function requireSync($trait) { |
|
65 | + $this->syncTraits[] = trim($trait, '\\'); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @param \OCP\Command\ICommand | callable $command |
|
70 | - */ |
|
71 | - private function runCommand($command) { |
|
72 | - if ($command instanceof ICommand) { |
|
73 | - $command->handle(); |
|
74 | - } else { |
|
75 | - $command(); |
|
76 | - } |
|
77 | - } |
|
68 | + /** |
|
69 | + * @param \OCP\Command\ICommand | callable $command |
|
70 | + */ |
|
71 | + private function runCommand($command) { |
|
72 | + if ($command instanceof ICommand) { |
|
73 | + $command->handle(); |
|
74 | + } else { |
|
75 | + $command(); |
|
76 | + } |
|
77 | + } |
|
78 | 78 | |
79 | - /** |
|
80 | - * @param \OCP\Command\ICommand | callable $command |
|
81 | - * @return bool |
|
82 | - */ |
|
83 | - private function canRunAsync($command) { |
|
84 | - $traits = $this->getTraits($command); |
|
85 | - foreach ($traits as $trait) { |
|
86 | - if (array_search($trait, $this->syncTraits) !== false) { |
|
87 | - return false; |
|
88 | - } |
|
89 | - } |
|
90 | - return true; |
|
91 | - } |
|
79 | + /** |
|
80 | + * @param \OCP\Command\ICommand | callable $command |
|
81 | + * @return bool |
|
82 | + */ |
|
83 | + private function canRunAsync($command) { |
|
84 | + $traits = $this->getTraits($command); |
|
85 | + foreach ($traits as $trait) { |
|
86 | + if (array_search($trait, $this->syncTraits) !== false) { |
|
87 | + return false; |
|
88 | + } |
|
89 | + } |
|
90 | + return true; |
|
91 | + } |
|
92 | 92 | |
93 | - /** |
|
94 | - * @param \OCP\Command\ICommand | callable $command |
|
95 | - * @return string[] |
|
96 | - */ |
|
97 | - private function getTraits($command) { |
|
98 | - if ($command instanceof ICommand) { |
|
99 | - return class_uses($command); |
|
100 | - } else { |
|
101 | - return []; |
|
102 | - } |
|
103 | - } |
|
93 | + /** |
|
94 | + * @param \OCP\Command\ICommand | callable $command |
|
95 | + * @return string[] |
|
96 | + */ |
|
97 | + private function getTraits($command) { |
|
98 | + if ($command instanceof ICommand) { |
|
99 | + return class_uses($command); |
|
100 | + } else { |
|
101 | + return []; |
|
102 | + } |
|
103 | + } |
|
104 | 104 | } |
@@ -32,34 +32,34 @@ |
||
32 | 32 | */ |
33 | 33 | class InvalidBackend extends Backend { |
34 | 34 | |
35 | - /** @var string Invalid backend id */ |
|
36 | - private $invalidId; |
|
35 | + /** @var string Invalid backend id */ |
|
36 | + private $invalidId; |
|
37 | 37 | |
38 | - /** |
|
39 | - * Constructs a new InvalidBackend with the id of the invalid backend |
|
40 | - * for display purposes |
|
41 | - * |
|
42 | - * @param string $invalidId id of the backend that did not exist |
|
43 | - */ |
|
44 | - function __construct($invalidId) { |
|
45 | - $this->invalidId = $invalidId; |
|
46 | - $this |
|
47 | - ->setIdentifier($invalidId) |
|
48 | - ->setStorageClass('\OC\Files\Storage\FailedStorage') |
|
49 | - ->setText('Unknown storage backend ' . $invalidId); |
|
50 | - } |
|
38 | + /** |
|
39 | + * Constructs a new InvalidBackend with the id of the invalid backend |
|
40 | + * for display purposes |
|
41 | + * |
|
42 | + * @param string $invalidId id of the backend that did not exist |
|
43 | + */ |
|
44 | + function __construct($invalidId) { |
|
45 | + $this->invalidId = $invalidId; |
|
46 | + $this |
|
47 | + ->setIdentifier($invalidId) |
|
48 | + ->setStorageClass('\OC\Files\Storage\FailedStorage') |
|
49 | + ->setText('Unknown storage backend ' . $invalidId); |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * Returns the invalid backend id |
|
54 | - * |
|
55 | - * @return string invalid backend id |
|
56 | - */ |
|
57 | - public function getInvalidId() { |
|
58 | - return $this->invalidId; |
|
59 | - } |
|
52 | + /** |
|
53 | + * Returns the invalid backend id |
|
54 | + * |
|
55 | + * @return string invalid backend id |
|
56 | + */ |
|
57 | + public function getInvalidId() { |
|
58 | + return $this->invalidId; |
|
59 | + } |
|
60 | 60 | |
61 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
62 | - $storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR)); |
|
63 | - } |
|
61 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
62 | + $storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR)); |
|
63 | + } |
|
64 | 64 | } |
65 | 65 |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $this |
50 | 50 | ->setIdentifier($invalidId) |
51 | 51 | ->setStorageClass('\OC\Files\Storage\FailedStorage') |
52 | - ->setText('Unknown storage backend ' . $invalidId); |
|
52 | + ->setText('Unknown storage backend '.$invalidId); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | } |
63 | 63 | |
64 | 64 | public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
65 | - $storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR)); |
|
65 | + $storage->setBackendOption('exception', new \Exception('Unknown storage backend "'.$this->invalidId.'"', StorageNotAvailableException::STATUS_ERROR)); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 |