@@ -28,62 +28,62 @@ |
||
28 | 28 | |
29 | 29 | class Logger implements ILogger { |
30 | 30 | |
31 | - /** @var ILogger */ |
|
32 | - private $logger; |
|
31 | + /** @var ILogger */ |
|
32 | + private $logger; |
|
33 | 33 | |
34 | - /** @var string */ |
|
35 | - private $appName; |
|
34 | + /** @var string */ |
|
35 | + private $appName; |
|
36 | 36 | |
37 | - public function __construct(ILogger $logger, string $appName) { |
|
38 | - $this->logger = $logger; |
|
39 | - $this->appName = $appName; |
|
40 | - } |
|
37 | + public function __construct(ILogger $logger, string $appName) { |
|
38 | + $this->logger = $logger; |
|
39 | + $this->appName = $appName; |
|
40 | + } |
|
41 | 41 | |
42 | - private function extendContext(array $context): array { |
|
43 | - if (!isset($context['app'])) { |
|
44 | - $context['app'] = $this->appName; |
|
45 | - } |
|
42 | + private function extendContext(array $context): array { |
|
43 | + if (!isset($context['app'])) { |
|
44 | + $context['app'] = $this->appName; |
|
45 | + } |
|
46 | 46 | |
47 | - return $context; |
|
48 | - } |
|
47 | + return $context; |
|
48 | + } |
|
49 | 49 | |
50 | - public function emergency(string $message, array $context = []) { |
|
51 | - $this->logger->emergency($message, $this->extendContext($context)); |
|
52 | - } |
|
50 | + public function emergency(string $message, array $context = []) { |
|
51 | + $this->logger->emergency($message, $this->extendContext($context)); |
|
52 | + } |
|
53 | 53 | |
54 | - public function alert(string $message, array $context = []) { |
|
55 | - $this->logger->alert($message, $this->extendContext($context)); |
|
56 | - } |
|
54 | + public function alert(string $message, array $context = []) { |
|
55 | + $this->logger->alert($message, $this->extendContext($context)); |
|
56 | + } |
|
57 | 57 | |
58 | - public function critical(string $message, array $context = []) { |
|
59 | - $this->logger->critical($message, $this->extendContext($context)); |
|
60 | - } |
|
58 | + public function critical(string $message, array $context = []) { |
|
59 | + $this->logger->critical($message, $this->extendContext($context)); |
|
60 | + } |
|
61 | 61 | |
62 | - public function error(string $message, array $context = []) { |
|
63 | - $this->logger->emergency($message, $this->extendContext($context)); |
|
64 | - } |
|
62 | + public function error(string $message, array $context = []) { |
|
63 | + $this->logger->emergency($message, $this->extendContext($context)); |
|
64 | + } |
|
65 | 65 | |
66 | - public function warning(string $message, array $context = []) { |
|
67 | - $this->logger->warning($message, $this->extendContext($context)); |
|
68 | - } |
|
66 | + public function warning(string $message, array $context = []) { |
|
67 | + $this->logger->warning($message, $this->extendContext($context)); |
|
68 | + } |
|
69 | 69 | |
70 | - public function notice(string $message, array $context = []) { |
|
71 | - $this->logger->notice($message, $this->extendContext($context)); |
|
72 | - } |
|
70 | + public function notice(string $message, array $context = []) { |
|
71 | + $this->logger->notice($message, $this->extendContext($context)); |
|
72 | + } |
|
73 | 73 | |
74 | - public function info(string $message, array $context = []) { |
|
75 | - $this->logger->info($message, $this->extendContext($context)); |
|
76 | - } |
|
74 | + public function info(string $message, array $context = []) { |
|
75 | + $this->logger->info($message, $this->extendContext($context)); |
|
76 | + } |
|
77 | 77 | |
78 | - public function debug(string $message, array $context = []) { |
|
79 | - $this->logger->debug($message, $this->extendContext($context)); |
|
80 | - } |
|
78 | + public function debug(string $message, array $context = []) { |
|
79 | + $this->logger->debug($message, $this->extendContext($context)); |
|
80 | + } |
|
81 | 81 | |
82 | - public function log(int $level, string $message, array $context = []) { |
|
83 | - $this->logger->log($level, $message, $this->extendContext($context)); |
|
84 | - } |
|
82 | + public function log(int $level, string $message, array $context = []) { |
|
83 | + $this->logger->log($level, $message, $this->extendContext($context)); |
|
84 | + } |
|
85 | 85 | |
86 | - public function logException(\Throwable $exception, array $context = []) { |
|
87 | - $this->logger->logException($exception, $this->extendContext($context)); |
|
88 | - } |
|
86 | + public function logException(\Throwable $exception, array $context = []) { |
|
87 | + $this->logger->logException($exception, $this->extendContext($context)); |
|
88 | + } |
|
89 | 89 | } |
@@ -29,15 +29,15 @@ |
||
29 | 29 | */ |
30 | 30 | interface ICollectBreadcrumbs extends IReporter { |
31 | 31 | |
32 | - /** |
|
33 | - * Collect breadcrumbs for crash reports |
|
34 | - * |
|
35 | - * @param string $message |
|
36 | - * @param string $category |
|
37 | - * @param array $context |
|
38 | - * |
|
39 | - * @since 15.0.0 |
|
40 | - */ |
|
41 | - public function collect(string $message, string $category, array $context = []); |
|
32 | + /** |
|
33 | + * Collect breadcrumbs for crash reports |
|
34 | + * |
|
35 | + * @param string $message |
|
36 | + * @param string $category |
|
37 | + * @param array $context |
|
38 | + * |
|
39 | + * @since 15.0.0 |
|
40 | + */ |
|
41 | + public function collect(string $message, string $category, array $context = []); |
|
42 | 42 | |
43 | 43 | } |
@@ -32,76 +32,76 @@ |
||
32 | 32 | */ |
33 | 33 | interface ICloudFederationProviderManager { |
34 | 34 | |
35 | - /** |
|
36 | - * Registers an callback function which must return an cloud federation provider |
|
37 | - * |
|
38 | - * @param string $resourceType which resource type does the provider handles |
|
39 | - * @param string $displayName user facing name of the federated share provider |
|
40 | - * @param callable $callback |
|
41 | - * @throws Exceptions\ProviderAlreadyExistsException |
|
42 | - * |
|
43 | - * @since 14.0.0 |
|
44 | - */ |
|
45 | - public function addCloudFederationProvider($resourceType, $displayName, callable $callback); |
|
35 | + /** |
|
36 | + * Registers an callback function which must return an cloud federation provider |
|
37 | + * |
|
38 | + * @param string $resourceType which resource type does the provider handles |
|
39 | + * @param string $displayName user facing name of the federated share provider |
|
40 | + * @param callable $callback |
|
41 | + * @throws Exceptions\ProviderAlreadyExistsException |
|
42 | + * |
|
43 | + * @since 14.0.0 |
|
44 | + */ |
|
45 | + public function addCloudFederationProvider($resourceType, $displayName, callable $callback); |
|
46 | 46 | |
47 | - /** |
|
48 | - * remove cloud federation provider |
|
49 | - * |
|
50 | - * @param string $resourceType |
|
51 | - * |
|
52 | - * @since 14.0.0 |
|
53 | - */ |
|
54 | - public function removeCloudFederationProvider($resourceType); |
|
47 | + /** |
|
48 | + * remove cloud federation provider |
|
49 | + * |
|
50 | + * @param string $resourceType |
|
51 | + * |
|
52 | + * @since 14.0.0 |
|
53 | + */ |
|
54 | + public function removeCloudFederationProvider($resourceType); |
|
55 | 55 | |
56 | - /** |
|
57 | - * get a list of all cloudFederationProviders |
|
58 | - * |
|
59 | - * @return array [resourceType => ['resourceType' => $resourceType, 'displayName' => $displayName, 'callback' => callback]] |
|
60 | - * |
|
61 | - * @since 14.0.0 |
|
62 | - */ |
|
63 | - public function getAllCloudFederationProviders(); |
|
56 | + /** |
|
57 | + * get a list of all cloudFederationProviders |
|
58 | + * |
|
59 | + * @return array [resourceType => ['resourceType' => $resourceType, 'displayName' => $displayName, 'callback' => callback]] |
|
60 | + * |
|
61 | + * @since 14.0.0 |
|
62 | + */ |
|
63 | + public function getAllCloudFederationProviders(); |
|
64 | 64 | |
65 | - /** |
|
66 | - * get a specific cloud federation provider |
|
67 | - * |
|
68 | - * @param string $resourceType |
|
69 | - * @return ICloudFederationProvider |
|
70 | - * @throws Exceptions\ProviderDoesNotExistsException |
|
71 | - * |
|
72 | - * @since 14.0.0 |
|
73 | - */ |
|
74 | - public function getCloudFederationProvider($resourceType); |
|
65 | + /** |
|
66 | + * get a specific cloud federation provider |
|
67 | + * |
|
68 | + * @param string $resourceType |
|
69 | + * @return ICloudFederationProvider |
|
70 | + * @throws Exceptions\ProviderDoesNotExistsException |
|
71 | + * |
|
72 | + * @since 14.0.0 |
|
73 | + */ |
|
74 | + public function getCloudFederationProvider($resourceType); |
|
75 | 75 | |
76 | - /** |
|
77 | - * send federated share |
|
78 | - * |
|
79 | - * @param ICloudFederationShare $share |
|
80 | - * @return mixed |
|
81 | - * |
|
82 | - * @since 14.0.0 |
|
83 | - */ |
|
84 | - public function sendShare(ICloudFederationShare $share); |
|
76 | + /** |
|
77 | + * send federated share |
|
78 | + * |
|
79 | + * @param ICloudFederationShare $share |
|
80 | + * @return mixed |
|
81 | + * |
|
82 | + * @since 14.0.0 |
|
83 | + */ |
|
84 | + public function sendShare(ICloudFederationShare $share); |
|
85 | 85 | |
86 | - /** |
|
87 | - * send notification about existing share |
|
88 | - * |
|
89 | - * @param string $url |
|
90 | - * @param ICloudFederationNotification $notification |
|
91 | - * @return mixed |
|
92 | - * |
|
93 | - * @since 14.0.0 |
|
94 | - */ |
|
95 | - public function sendNotification($url, ICloudFederationNotification $notification); |
|
86 | + /** |
|
87 | + * send notification about existing share |
|
88 | + * |
|
89 | + * @param string $url |
|
90 | + * @param ICloudFederationNotification $notification |
|
91 | + * @return mixed |
|
92 | + * |
|
93 | + * @since 14.0.0 |
|
94 | + */ |
|
95 | + public function sendNotification($url, ICloudFederationNotification $notification); |
|
96 | 96 | |
97 | - /** |
|
98 | - * check if the new cloud federation API is ready to be used |
|
99 | - * |
|
100 | - * @return bool |
|
101 | - * |
|
102 | - * @since 14.0.0 |
|
103 | - */ |
|
104 | - public function isReady(); |
|
97 | + /** |
|
98 | + * check if the new cloud federation API is ready to be used |
|
99 | + * |
|
100 | + * @return bool |
|
101 | + * |
|
102 | + * @since 14.0.0 |
|
103 | + */ |
|
104 | + public function isReady(); |
|
105 | 105 | |
106 | 106 | |
107 | 107 | } |
@@ -34,22 +34,22 @@ |
||
34 | 34 | */ |
35 | 35 | interface IProvidesIcons extends IProvider { |
36 | 36 | |
37 | - /** |
|
38 | - * Get the path to the light (white) icon of this provider |
|
39 | - * |
|
40 | - * @return String |
|
41 | - * |
|
42 | - * @since 15.0.0 |
|
43 | - */ |
|
44 | - public function getLightIcon(): String; |
|
37 | + /** |
|
38 | + * Get the path to the light (white) icon of this provider |
|
39 | + * |
|
40 | + * @return String |
|
41 | + * |
|
42 | + * @since 15.0.0 |
|
43 | + */ |
|
44 | + public function getLightIcon(): String; |
|
45 | 45 | |
46 | - /** |
|
47 | - * Get the path to the dark (black) icon of this provider |
|
48 | - * |
|
49 | - * @return String |
|
50 | - * |
|
51 | - * @since 15.0.0 |
|
52 | - */ |
|
53 | - public function getDarkIcon(): String; |
|
46 | + /** |
|
47 | + * Get the path to the dark (black) icon of this provider |
|
48 | + * |
|
49 | + * @return String |
|
50 | + * |
|
51 | + * @since 15.0.0 |
|
52 | + */ |
|
53 | + public function getDarkIcon(): String; |
|
54 | 54 | |
55 | 55 | } |
@@ -30,19 +30,19 @@ |
||
30 | 30 | |
31 | 31 | class CheckBackupCodes implements IRepairStep { |
32 | 32 | |
33 | - /** @var IJobList */ |
|
34 | - private $jobList; |
|
33 | + /** @var IJobList */ |
|
34 | + private $jobList; |
|
35 | 35 | |
36 | - public function __construct(IJobList $jobList) { |
|
37 | - $this->jobList = $jobList; |
|
38 | - } |
|
36 | + public function __construct(IJobList $jobList) { |
|
37 | + $this->jobList = $jobList; |
|
38 | + } |
|
39 | 39 | |
40 | - public function getName(): string { |
|
41 | - return 'Add background job to check for backup codes'; |
|
42 | - } |
|
40 | + public function getName(): string { |
|
41 | + return 'Add background job to check for backup codes'; |
|
42 | + } |
|
43 | 43 | |
44 | - public function run(IOutput $output) { |
|
45 | - $this->jobList->add(\OCA\TwoFactorBackupCodes\BackgroundJob\CheckBackupCodes::class); |
|
46 | - } |
|
44 | + public function run(IOutput $output) { |
|
45 | + $this->jobList->add(\OCA\TwoFactorBackupCodes\BackgroundJob\CheckBackupCodes::class); |
|
46 | + } |
|
47 | 47 | |
48 | 48 | } |
@@ -33,11 +33,11 @@ |
||
33 | 33 | */ |
34 | 34 | interface IPersonalProviderSettings { |
35 | 35 | |
36 | - /** |
|
37 | - * @return Template |
|
38 | - * |
|
39 | - * @since 15.0.0 |
|
40 | - */ |
|
41 | - public function getBody(): Template; |
|
36 | + /** |
|
37 | + * @return Template |
|
38 | + * |
|
39 | + * @since 15.0.0 |
|
40 | + */ |
|
41 | + public function getBody(): Template; |
|
42 | 42 | |
43 | 43 | } |
@@ -35,13 +35,13 @@ |
||
35 | 35 | */ |
36 | 36 | interface IProvidesPersonalSettings extends IProvider { |
37 | 37 | |
38 | - /** |
|
39 | - * @param IUser $user |
|
40 | - * |
|
41 | - * @return IPersonalProviderSettings |
|
42 | - * |
|
43 | - * @since 15.0.0 |
|
44 | - */ |
|
45 | - public function getPersonalSettings(IUser $user): IPersonalProviderSettings; |
|
38 | + /** |
|
39 | + * @param IUser $user |
|
40 | + * |
|
41 | + * @return IPersonalProviderSettings |
|
42 | + * |
|
43 | + * @since 15.0.0 |
|
44 | + */ |
|
45 | + public function getPersonalSettings(IUser $user): IPersonalProviderSettings; |
|
46 | 46 | |
47 | 47 | } |
@@ -24,11 +24,11 @@ |
||
24 | 24 | <?php if (!is_null($_['backupProvider'])): ?> |
25 | 25 | <p> |
26 | 26 | <a class="two-factor-secondary" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge', |
27 | - [ |
|
28 | - 'challengeProviderId' => $_['backupProvider']->getId(), |
|
29 | - 'redirect_url' => $_['redirect_url'], |
|
30 | - ] |
|
31 | - )) ?>"> |
|
27 | + [ |
|
28 | + 'challengeProviderId' => $_['backupProvider']->getId(), |
|
29 | + 'redirect_url' => $_['redirect_url'], |
|
30 | + ] |
|
31 | + )) ?>"> |
|
32 | 32 | <?php p($l->t('Use backup code')) ?> |
33 | 33 | </a> |
34 | 34 | </p> |
@@ -31,41 +31,41 @@ |
||
31 | 31 | */ |
32 | 32 | interface IManager { |
33 | 33 | |
34 | - /** |
|
35 | - * Registers a resource backend |
|
36 | - * |
|
37 | - * @param string $backendClass |
|
38 | - * @return void |
|
39 | - * @since 14.0.0 |
|
40 | - */ |
|
41 | - public function registerBackend(string $backendClass); |
|
34 | + /** |
|
35 | + * Registers a resource backend |
|
36 | + * |
|
37 | + * @param string $backendClass |
|
38 | + * @return void |
|
39 | + * @since 14.0.0 |
|
40 | + */ |
|
41 | + public function registerBackend(string $backendClass); |
|
42 | 42 | |
43 | - /** |
|
44 | - * Unregisters a resource backend |
|
45 | - * |
|
46 | - * @param string $backendClass |
|
47 | - * @return void |
|
48 | - * @since 14.0.0 |
|
49 | - */ |
|
50 | - public function unregisterBackend(string $backendClass); |
|
43 | + /** |
|
44 | + * Unregisters a resource backend |
|
45 | + * |
|
46 | + * @param string $backendClass |
|
47 | + * @return void |
|
48 | + * @since 14.0.0 |
|
49 | + */ |
|
50 | + public function unregisterBackend(string $backendClass); |
|
51 | 51 | |
52 | - /** |
|
53 | - * @return IBackend[] |
|
54 | - * @since 14.0.0 |
|
55 | - */ |
|
56 | - public function getBackends():array; |
|
52 | + /** |
|
53 | + * @return IBackend[] |
|
54 | + * @since 14.0.0 |
|
55 | + */ |
|
56 | + public function getBackends():array; |
|
57 | 57 | |
58 | - /** |
|
59 | - * @param string $backendId |
|
60 | - * @return IBackend|null |
|
61 | - * @since 14.0.0 |
|
62 | - */ |
|
63 | - public function getBackend($backendId); |
|
58 | + /** |
|
59 | + * @param string $backendId |
|
60 | + * @return IBackend|null |
|
61 | + * @since 14.0.0 |
|
62 | + */ |
|
63 | + public function getBackend($backendId); |
|
64 | 64 | |
65 | - /** |
|
66 | - * removes all registered backend instances |
|
67 | - * @return void |
|
68 | - * @since 14.0.0 |
|
69 | - */ |
|
70 | - public function clear(); |
|
65 | + /** |
|
66 | + * removes all registered backend instances |
|
67 | + * @return void |
|
68 | + * @since 14.0.0 |
|
69 | + */ |
|
70 | + public function clear(); |
|
71 | 71 | } |