@@ -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 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $this |
47 | 47 | ->setIdentifier($invalidId) |
48 | 48 | ->setStorageClass('\OC\Files\Storage\FailedStorage') |
49 | - ->setText('Unknown storage backend ' . $invalidId); |
|
49 | + ->setText('Unknown storage backend '.$invalidId); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | return $this->invalidId; |
59 | 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)); |
|
61 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
62 | + $storage->setBackendOption('exception', new \Exception('Unknown storage backend "'.$this->invalidId.'"', StorageNotAvailableException::STATUS_ERROR)); |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 |
@@ -34,33 +34,33 @@ |
||
34 | 34 | */ |
35 | 35 | class InvalidBackend extends Backend { |
36 | 36 | |
37 | - /** @var string Invalid backend id */ |
|
38 | - private $invalidId; |
|
37 | + /** @var string Invalid backend id */ |
|
38 | + private $invalidId; |
|
39 | 39 | |
40 | - /** |
|
41 | - * Constructs a new InvalidBackend with the id of the invalid backend |
|
42 | - * for display purposes |
|
43 | - * |
|
44 | - * @param string $invalidId id of the backend that did not exist |
|
45 | - */ |
|
46 | - public function __construct($invalidId) { |
|
47 | - $this->invalidId = $invalidId; |
|
48 | - $this |
|
49 | - ->setIdentifier($invalidId) |
|
50 | - ->setStorageClass('\OC\Files\Storage\FailedStorage') |
|
51 | - ->setText('Unknown storage backend ' . $invalidId); |
|
52 | - } |
|
40 | + /** |
|
41 | + * Constructs a new InvalidBackend with the id of the invalid backend |
|
42 | + * for display purposes |
|
43 | + * |
|
44 | + * @param string $invalidId id of the backend that did not exist |
|
45 | + */ |
|
46 | + public function __construct($invalidId) { |
|
47 | + $this->invalidId = $invalidId; |
|
48 | + $this |
|
49 | + ->setIdentifier($invalidId) |
|
50 | + ->setStorageClass('\OC\Files\Storage\FailedStorage') |
|
51 | + ->setText('Unknown storage backend ' . $invalidId); |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Returns the invalid backend id |
|
56 | - * |
|
57 | - * @return string invalid backend id |
|
58 | - */ |
|
59 | - public function getInvalidId() { |
|
60 | - return $this->invalidId; |
|
61 | - } |
|
54 | + /** |
|
55 | + * Returns the invalid backend id |
|
56 | + * |
|
57 | + * @return string invalid backend id |
|
58 | + */ |
|
59 | + public function getInvalidId() { |
|
60 | + return $this->invalidId; |
|
61 | + } |
|
62 | 62 | |
63 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
64 | - $storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR)); |
|
65 | - } |
|
63 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
64 | + $storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR)); |
|
65 | + } |
|
66 | 66 | } |
@@ -30,13 +30,13 @@ |
||
30 | 30 | * @since 13.0.0 |
31 | 31 | */ |
32 | 32 | interface ISearchPlugin { |
33 | - /** |
|
34 | - * @param string $search |
|
35 | - * @param int $limit |
|
36 | - * @param int $offset |
|
37 | - * @param ISearchResult $searchResult |
|
38 | - * @return bool whether the plugin has more results |
|
39 | - * @since 13.0.0 |
|
40 | - */ |
|
41 | - public function search($search, $limit, $offset, ISearchResult $searchResult); |
|
33 | + /** |
|
34 | + * @param string $search |
|
35 | + * @param int $limit |
|
36 | + * @param int $offset |
|
37 | + * @param ISearchResult $searchResult |
|
38 | + * @return bool whether the plugin has more results |
|
39 | + * @since 13.0.0 |
|
40 | + */ |
|
41 | + public function search($search, $limit, $offset, ISearchResult $searchResult); |
|
42 | 42 | } |
@@ -30,21 +30,21 @@ |
||
30 | 30 | * @since 13.0.0 |
31 | 31 | */ |
32 | 32 | interface ISearch { |
33 | - /** |
|
34 | - * @param string $search |
|
35 | - * @param array $shareTypes |
|
36 | - * @param bool $lookup |
|
37 | - * @param int $limit |
|
38 | - * @param int $offset |
|
39 | - * @return array with two elements, 1st ISearchResult as array, 2nd a bool indicating whether more result are available |
|
40 | - * @since 13.0.0 |
|
41 | - */ |
|
42 | - public function search($search, array $shareTypes, $lookup, $limit, $offset); |
|
33 | + /** |
|
34 | + * @param string $search |
|
35 | + * @param array $shareTypes |
|
36 | + * @param bool $lookup |
|
37 | + * @param int $limit |
|
38 | + * @param int $offset |
|
39 | + * @return array with two elements, 1st ISearchResult as array, 2nd a bool indicating whether more result are available |
|
40 | + * @since 13.0.0 |
|
41 | + */ |
|
42 | + public function search($search, array $shareTypes, $lookup, $limit, $offset); |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param array $pluginInfo with keys 'shareType' containing the name of a corresponding constant in \OCP\Share and |
|
46 | - * 'class' with the class name of the plugin |
|
47 | - * @since 13.0.0 |
|
48 | - */ |
|
49 | - public function registerPlugin(array $pluginInfo); |
|
44 | + /** |
|
45 | + * @param array $pluginInfo with keys 'shareType' containing the name of a corresponding constant in \OCP\Share and |
|
46 | + * 'class' with the class name of the plugin |
|
47 | + * @since 13.0.0 |
|
48 | + */ |
|
49 | + public function registerPlugin(array $pluginInfo); |
|
50 | 50 | } |
@@ -35,39 +35,39 @@ |
||
35 | 35 | */ |
36 | 36 | class MoveToTrashEvent extends Event { |
37 | 37 | |
38 | - /** @var bool */ |
|
39 | - private $moveToTrashBin; |
|
38 | + /** @var bool */ |
|
39 | + private $moveToTrashBin; |
|
40 | 40 | |
41 | - /** @var Node */ |
|
42 | - private $node; |
|
41 | + /** @var Node */ |
|
42 | + private $node; |
|
43 | 43 | |
44 | - public function __construct(Node $node) { |
|
45 | - $this->moveToTrashBin = true; |
|
46 | - $this->node = $node; |
|
47 | - } |
|
44 | + public function __construct(Node $node) { |
|
45 | + $this->moveToTrashBin = true; |
|
46 | + $this->node = $node; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * get Node which will be deleted |
|
51 | - * |
|
52 | - * @return Node |
|
53 | - */ |
|
54 | - public function getNode() { |
|
55 | - return $this->node; |
|
56 | - } |
|
49 | + /** |
|
50 | + * get Node which will be deleted |
|
51 | + * |
|
52 | + * @return Node |
|
53 | + */ |
|
54 | + public function getNode() { |
|
55 | + return $this->node; |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * disable trash bin for this operation |
|
60 | - */ |
|
61 | - public function disableTrashBin() { |
|
62 | - $this->moveToTrashBin = false; |
|
63 | - } |
|
58 | + /** |
|
59 | + * disable trash bin for this operation |
|
60 | + */ |
|
61 | + public function disableTrashBin() { |
|
62 | + $this->moveToTrashBin = false; |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * should the file be moved to the trash bin? |
|
67 | - * |
|
68 | - * @return bool |
|
69 | - */ |
|
70 | - public function shouldMoveToTrashBin() { |
|
71 | - return $this->moveToTrashBin; |
|
72 | - } |
|
65 | + /** |
|
66 | + * should the file be moved to the trash bin? |
|
67 | + * |
|
68 | + * @return bool |
|
69 | + */ |
|
70 | + public function shouldMoveToTrashBin() { |
|
71 | + return $this->moveToTrashBin; |
|
72 | + } |
|
73 | 73 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * @package OC\AppFramework\Middleware\Security\Exceptions |
33 | 33 | */ |
34 | 34 | class LaxSameSiteCookieFailedException extends SecurityException { |
35 | - public function __construct() { |
|
36 | - parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | - } |
|
35 | + public function __construct() { |
|
36 | + parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | + } |
|
38 | 38 | } |
@@ -29,60 +29,60 @@ |
||
29 | 29 | use OCP\IURLGenerator; |
30 | 30 | |
31 | 31 | class ContactsManager { |
32 | - /** @var CardDavBackend */ |
|
33 | - private $backend; |
|
32 | + /** @var CardDavBackend */ |
|
33 | + private $backend; |
|
34 | 34 | |
35 | - /** @var IL10N */ |
|
36 | - private $l10n; |
|
35 | + /** @var IL10N */ |
|
36 | + private $l10n; |
|
37 | 37 | |
38 | - /** |
|
39 | - * ContactsManager constructor. |
|
40 | - * |
|
41 | - * @param CardDavBackend $backend |
|
42 | - * @param IL10N $l10n |
|
43 | - */ |
|
44 | - public function __construct(CardDavBackend $backend, IL10N $l10n) { |
|
45 | - $this->backend = $backend; |
|
46 | - $this->l10n = $l10n; |
|
47 | - } |
|
38 | + /** |
|
39 | + * ContactsManager constructor. |
|
40 | + * |
|
41 | + * @param CardDavBackend $backend |
|
42 | + * @param IL10N $l10n |
|
43 | + */ |
|
44 | + public function __construct(CardDavBackend $backend, IL10N $l10n) { |
|
45 | + $this->backend = $backend; |
|
46 | + $this->l10n = $l10n; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param IManager $cm |
|
51 | - * @param string $userId |
|
52 | - * @param IURLGenerator $urlGenerator |
|
53 | - */ |
|
54 | - public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) { |
|
55 | - $addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId"); |
|
56 | - $this->register($cm, $addressBooks, $urlGenerator); |
|
57 | - $this->setupSystemContactsProvider($cm, $urlGenerator); |
|
58 | - } |
|
49 | + /** |
|
50 | + * @param IManager $cm |
|
51 | + * @param string $userId |
|
52 | + * @param IURLGenerator $urlGenerator |
|
53 | + */ |
|
54 | + public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) { |
|
55 | + $addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId"); |
|
56 | + $this->register($cm, $addressBooks, $urlGenerator); |
|
57 | + $this->setupSystemContactsProvider($cm, $urlGenerator); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @param IManager $cm |
|
62 | - * @param IURLGenerator $urlGenerator |
|
63 | - */ |
|
64 | - public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) { |
|
65 | - $addressBooks = $this->backend->getAddressBooksForUser("principals/system/system"); |
|
66 | - $this->register($cm, $addressBooks, $urlGenerator); |
|
67 | - } |
|
60 | + /** |
|
61 | + * @param IManager $cm |
|
62 | + * @param IURLGenerator $urlGenerator |
|
63 | + */ |
|
64 | + public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) { |
|
65 | + $addressBooks = $this->backend->getAddressBooksForUser("principals/system/system"); |
|
66 | + $this->register($cm, $addressBooks, $urlGenerator); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * @param IManager $cm |
|
71 | - * @param $addressBooks |
|
72 | - * @param IURLGenerator $urlGenerator |
|
73 | - */ |
|
74 | - private function register(IManager $cm, $addressBooks, $urlGenerator) { |
|
75 | - foreach ($addressBooks as $addressBookInfo) { |
|
76 | - $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n); |
|
77 | - $cm->registerAddressBook( |
|
78 | - new AddressBookImpl( |
|
79 | - $addressBook, |
|
80 | - $addressBookInfo, |
|
81 | - $this->backend, |
|
82 | - $urlGenerator |
|
83 | - ) |
|
84 | - ); |
|
85 | - } |
|
86 | - } |
|
69 | + /** |
|
70 | + * @param IManager $cm |
|
71 | + * @param $addressBooks |
|
72 | + * @param IURLGenerator $urlGenerator |
|
73 | + */ |
|
74 | + private function register(IManager $cm, $addressBooks, $urlGenerator) { |
|
75 | + foreach ($addressBooks as $addressBookInfo) { |
|
76 | + $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n); |
|
77 | + $cm->registerAddressBook( |
|
78 | + new AddressBookImpl( |
|
79 | + $addressBook, |
|
80 | + $addressBookInfo, |
|
81 | + $this->backend, |
|
82 | + $urlGenerator |
|
83 | + ) |
|
84 | + ); |
|
85 | + } |
|
86 | + } |
|
87 | 87 | |
88 | 88 | } |
@@ -11,15 +11,15 @@ |
||
11 | 11 | */ |
12 | 12 | class Version1002Date20170926101419 extends BigIntMigration { |
13 | 13 | |
14 | - /** |
|
15 | - * @return array Returns an array with the following structure |
|
16 | - * ['table1' => ['column1', 'column2'], ...] |
|
17 | - * @since 13.0.0 |
|
18 | - */ |
|
19 | - protected function getColumnsByTable() { |
|
20 | - return [ |
|
21 | - 'twofactor_backupcodes' => ['id'], |
|
22 | - ]; |
|
23 | - } |
|
14 | + /** |
|
15 | + * @return array Returns an array with the following structure |
|
16 | + * ['table1' => ['column1', 'column2'], ...] |
|
17 | + * @since 13.0.0 |
|
18 | + */ |
|
19 | + protected function getColumnsByTable() { |
|
20 | + return [ |
|
21 | + 'twofactor_backupcodes' => ['id'], |
|
22 | + ]; |
|
23 | + } |
|
24 | 24 | |
25 | 25 | } |
@@ -11,25 +11,25 @@ |
||
11 | 11 | */ |
12 | 12 | class Version1004Date20170926103422 extends BigIntMigration { |
13 | 13 | |
14 | - /** |
|
15 | - * @return array Returns an array with the following structure |
|
16 | - * ['table1' => ['column1', 'column2'], ...] |
|
17 | - * @since 13.0.0 |
|
18 | - */ |
|
19 | - protected function getColumnsByTable() { |
|
20 | - return [ |
|
21 | - 'addressbooks' => ['id'], |
|
22 | - 'addressbookchanges' => ['id', 'addressbookid'], |
|
23 | - 'calendars' => ['id'], |
|
24 | - 'calendarchanges' => ['id', 'calendarid'], |
|
25 | - 'calendarobjects' => ['id', 'calendarid'], |
|
26 | - 'calendarobjects_props' => ['id', 'calendarid', 'objectid'], |
|
27 | - 'calendarsubscriptions' => ['id'], |
|
28 | - 'cards' => ['id', 'addressbookid'], |
|
29 | - 'cards_properties' => ['id', 'addressbookid', 'cardid'], |
|
30 | - 'dav_shares' => ['id', 'resourceid'], |
|
31 | - 'schedulingobjects' => ['id'], |
|
32 | - ]; |
|
33 | - } |
|
14 | + /** |
|
15 | + * @return array Returns an array with the following structure |
|
16 | + * ['table1' => ['column1', 'column2'], ...] |
|
17 | + * @since 13.0.0 |
|
18 | + */ |
|
19 | + protected function getColumnsByTable() { |
|
20 | + return [ |
|
21 | + 'addressbooks' => ['id'], |
|
22 | + 'addressbookchanges' => ['id', 'addressbookid'], |
|
23 | + 'calendars' => ['id'], |
|
24 | + 'calendarchanges' => ['id', 'calendarid'], |
|
25 | + 'calendarobjects' => ['id', 'calendarid'], |
|
26 | + 'calendarobjects_props' => ['id', 'calendarid', 'objectid'], |
|
27 | + 'calendarsubscriptions' => ['id'], |
|
28 | + 'cards' => ['id', 'addressbookid'], |
|
29 | + 'cards_properties' => ['id', 'addressbookid', 'cardid'], |
|
30 | + 'dav_shares' => ['id', 'resourceid'], |
|
31 | + 'schedulingobjects' => ['id'], |
|
32 | + ]; |
|
33 | + } |
|
34 | 34 | |
35 | 35 | } |