@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class Ajax extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'ajax'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'ajax'; |
|
31 | + } |
|
32 | 32 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class Cron extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'cron'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'cron'; |
|
31 | + } |
|
32 | 32 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | namespace OC\Core\Command\Background; |
27 | 27 | |
28 | 28 | class WebCron extends Base { |
29 | - protected function getMode() { |
|
30 | - return 'webcron'; |
|
31 | - } |
|
29 | + protected function getMode() { |
|
30 | + return 'webcron'; |
|
31 | + } |
|
32 | 32 | } |
@@ -11,43 +11,43 @@ |
||
11 | 11 | use OCP\Share\IManager; |
12 | 12 | |
13 | 13 | class OCSShareAPIMiddleware extends Middleware { |
14 | - /** @var IManager */ |
|
15 | - private $shareManager; |
|
16 | - /** @var IL10N */ |
|
17 | - private $l; |
|
14 | + /** @var IManager */ |
|
15 | + private $shareManager; |
|
16 | + /** @var IL10N */ |
|
17 | + private $l; |
|
18 | 18 | |
19 | - public function __construct(IManager $shareManager, |
|
20 | - IL10N $l) { |
|
21 | - $this->shareManager = $shareManager; |
|
22 | - $this->l = $l; |
|
23 | - } |
|
19 | + public function __construct(IManager $shareManager, |
|
20 | + IL10N $l) { |
|
21 | + $this->shareManager = $shareManager; |
|
22 | + $this->l = $l; |
|
23 | + } |
|
24 | 24 | |
25 | - /** |
|
26 | - * @param Controller $controller |
|
27 | - * @param string $methodName |
|
28 | - * |
|
29 | - * @throws OCSNotFoundException |
|
30 | - */ |
|
31 | - public function beforeController($controller, $methodName) { |
|
32 | - if ($controller instanceof ShareAPIController) { |
|
33 | - if (!$this->shareManager->shareApiEnabled()) { |
|
34 | - throw new OCSNotFoundException($this->l->t('Share API is disabled')); |
|
35 | - } |
|
36 | - } |
|
37 | - } |
|
25 | + /** |
|
26 | + * @param Controller $controller |
|
27 | + * @param string $methodName |
|
28 | + * |
|
29 | + * @throws OCSNotFoundException |
|
30 | + */ |
|
31 | + public function beforeController($controller, $methodName) { |
|
32 | + if ($controller instanceof ShareAPIController) { |
|
33 | + if (!$this->shareManager->shareApiEnabled()) { |
|
34 | + throw new OCSNotFoundException($this->l->t('Share API is disabled')); |
|
35 | + } |
|
36 | + } |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param Controller $controller |
|
41 | - * @param string $methodName |
|
42 | - * @param Response $response |
|
43 | - * @return Response |
|
44 | - */ |
|
45 | - public function afterController($controller, $methodName, Response $response) { |
|
46 | - if ($controller instanceof ShareAPIController) { |
|
47 | - /** @var ShareAPIController $controller */ |
|
48 | - $controller->cleanup(); |
|
49 | - } |
|
39 | + /** |
|
40 | + * @param Controller $controller |
|
41 | + * @param string $methodName |
|
42 | + * @param Response $response |
|
43 | + * @return Response |
|
44 | + */ |
|
45 | + public function afterController($controller, $methodName, Response $response) { |
|
46 | + if ($controller instanceof ShareAPIController) { |
|
47 | + /** @var ShareAPIController $controller */ |
|
48 | + $controller->cleanup(); |
|
49 | + } |
|
50 | 50 | |
51 | - return $response; |
|
52 | - } |
|
51 | + return $response; |
|
52 | + } |
|
53 | 53 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |