@@ -31,17 +31,17 @@ |
||
31 | 31 | use OCP\Migration\IRepairStep; |
32 | 32 | |
33 | 33 | class AddTokenCleanupJob implements IRepairStep { |
34 | - private IJobList $jobList; |
|
34 | + private IJobList $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 token cleanup job'; |
|
42 | - } |
|
40 | + public function getName(): string { |
|
41 | + return 'Add token cleanup job'; |
|
42 | + } |
|
43 | 43 | |
44 | - public function run(IOutput $output) { |
|
45 | - $this->jobList->add(TokenCleanupJob::class); |
|
46 | - } |
|
44 | + public function run(IOutput $output) { |
|
45 | + $this->jobList->add(TokenCleanupJob::class); |
|
46 | + } |
|
47 | 47 | } |
@@ -28,36 +28,36 @@ |
||
28 | 28 | * @since 25.0.0 |
29 | 29 | */ |
30 | 30 | interface IReferenceProvider { |
31 | - /** |
|
32 | - * Validate that a given reference identifier matches the current provider |
|
33 | - * |
|
34 | - * @since 25.0.0 |
|
35 | - */ |
|
36 | - public function matchReference(string $referenceText): bool; |
|
31 | + /** |
|
32 | + * Validate that a given reference identifier matches the current provider |
|
33 | + * |
|
34 | + * @since 25.0.0 |
|
35 | + */ |
|
36 | + public function matchReference(string $referenceText): bool; |
|
37 | 37 | |
38 | - /** |
|
39 | - * Return a reference with its metadata for a given reference identifier |
|
40 | - * |
|
41 | - * @since 25.0.0 |
|
42 | - */ |
|
43 | - public function resolveReference(string $referenceText): ?IReference; |
|
38 | + /** |
|
39 | + * Return a reference with its metadata for a given reference identifier |
|
40 | + * |
|
41 | + * @since 25.0.0 |
|
42 | + */ |
|
43 | + public function resolveReference(string $referenceText): ?IReference; |
|
44 | 44 | |
45 | - /** |
|
46 | - * Return true if the reference metadata can be globally cached |
|
47 | - * |
|
48 | - * @since 25.0.0 |
|
49 | - */ |
|
50 | - public function getCachePrefix(string $referenceId): string; |
|
45 | + /** |
|
46 | + * Return true if the reference metadata can be globally cached |
|
47 | + * |
|
48 | + * @since 25.0.0 |
|
49 | + */ |
|
50 | + public function getCachePrefix(string $referenceId): string; |
|
51 | 51 | |
52 | - /** |
|
53 | - * Return a custom cache key to be used for caching the metadata |
|
54 | - * This could be for example the current user id if the reference |
|
55 | - * access permissions are different for each user |
|
56 | - * |
|
57 | - * Should return null, if the cache is only related to the |
|
58 | - * reference id and has no further dependency |
|
59 | - * |
|
60 | - * @since 25.0.0 |
|
61 | - */ |
|
62 | - public function getCacheKey(string $referenceId): ?string; |
|
52 | + /** |
|
53 | + * Return a custom cache key to be used for caching the metadata |
|
54 | + * This could be for example the current user id if the reference |
|
55 | + * access permissions are different for each user |
|
56 | + * |
|
57 | + * Should return null, if the cache is only related to the |
|
58 | + * reference id and has no further dependency |
|
59 | + * |
|
60 | + * @since 25.0.0 |
|
61 | + */ |
|
62 | + public function getCacheKey(string $referenceId): ?string; |
|
63 | 63 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | */ |
24 | 24 | |
25 | 25 | if ($_['passwordChangeSupported']) { |
26 | - \OCP\Util::addScript('settings', 'vue-settings-personal-password'); |
|
26 | + \OCP\Util::addScript('settings', 'vue-settings-personal-password'); |
|
27 | 27 | } |
28 | 28 | ?> |
29 | 29 | <div id="security-password"></div> |
@@ -28,58 +28,58 @@ |
||
28 | 28 | use Icewind\Streams\Wrapper; |
29 | 29 | |
30 | 30 | class HashWrapper extends Wrapper { |
31 | - protected $callback; |
|
32 | - protected $hash; |
|
31 | + protected $callback; |
|
32 | + protected $hash; |
|
33 | 33 | |
34 | - public static function wrap($source, string $algo, callable $callback) { |
|
35 | - $hash = hash_init($algo); |
|
36 | - $context = stream_context_create([ |
|
37 | - 'hash' => [ |
|
38 | - 'source' => $source, |
|
39 | - 'callback' => $callback, |
|
40 | - 'hash' => $hash, |
|
41 | - ], |
|
42 | - ]); |
|
43 | - return Wrapper::wrapSource($source, $context, 'hash', self::class); |
|
44 | - } |
|
34 | + public static function wrap($source, string $algo, callable $callback) { |
|
35 | + $hash = hash_init($algo); |
|
36 | + $context = stream_context_create([ |
|
37 | + 'hash' => [ |
|
38 | + 'source' => $source, |
|
39 | + 'callback' => $callback, |
|
40 | + 'hash' => $hash, |
|
41 | + ], |
|
42 | + ]); |
|
43 | + return Wrapper::wrapSource($source, $context, 'hash', self::class); |
|
44 | + } |
|
45 | 45 | |
46 | - protected function open() { |
|
47 | - $context = $this->loadContext('hash'); |
|
46 | + protected function open() { |
|
47 | + $context = $this->loadContext('hash'); |
|
48 | 48 | |
49 | - $this->callback = $context['callback']; |
|
50 | - $this->hash = $context['hash']; |
|
51 | - return true; |
|
52 | - } |
|
49 | + $this->callback = $context['callback']; |
|
50 | + $this->hash = $context['hash']; |
|
51 | + return true; |
|
52 | + } |
|
53 | 53 | |
54 | - public function dir_opendir($path, $options) { |
|
55 | - return $this->open(); |
|
56 | - } |
|
54 | + public function dir_opendir($path, $options) { |
|
55 | + return $this->open(); |
|
56 | + } |
|
57 | 57 | |
58 | - public function stream_open($path, $mode, $options, &$opened_path) { |
|
59 | - return $this->open(); |
|
60 | - } |
|
58 | + public function stream_open($path, $mode, $options, &$opened_path) { |
|
59 | + return $this->open(); |
|
60 | + } |
|
61 | 61 | |
62 | - public function stream_read($count) { |
|
63 | - $result = parent::stream_read($count); |
|
64 | - hash_update($this->hash, $result); |
|
65 | - return $result; |
|
66 | - } |
|
62 | + public function stream_read($count) { |
|
63 | + $result = parent::stream_read($count); |
|
64 | + hash_update($this->hash, $result); |
|
65 | + return $result; |
|
66 | + } |
|
67 | 67 | |
68 | - public function stream_close() { |
|
69 | - if (is_callable($this->callback)) { |
|
70 | - // if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream |
|
71 | - if ($this->hash instanceof \HashContext) { |
|
72 | - try { |
|
73 | - $hash = @hash_final($this->hash); |
|
74 | - if ($hash) { |
|
75 | - call_user_func($this->callback, $hash); |
|
76 | - } |
|
77 | - } catch (\Throwable $e) { |
|
78 | - } |
|
79 | - } |
|
80 | - // prevent further calls by potential PHP 7 GC ghosts |
|
81 | - $this->callback = null; |
|
82 | - } |
|
83 | - return parent::stream_close(); |
|
84 | - } |
|
68 | + public function stream_close() { |
|
69 | + if (is_callable($this->callback)) { |
|
70 | + // if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream |
|
71 | + if ($this->hash instanceof \HashContext) { |
|
72 | + try { |
|
73 | + $hash = @hash_final($this->hash); |
|
74 | + if ($hash) { |
|
75 | + call_user_func($this->callback, $hash); |
|
76 | + } |
|
77 | + } catch (\Throwable $e) { |
|
78 | + } |
|
79 | + } |
|
80 | + // prevent further calls by potential PHP 7 GC ghosts |
|
81 | + $this->callback = null; |
|
82 | + } |
|
83 | + return parent::stream_close(); |
|
84 | + } |
|
85 | 85 | } |
@@ -34,21 +34,21 @@ |
||
34 | 34 | * @since 25.0.0 |
35 | 35 | */ |
36 | 36 | class BeforeTemplateRenderedEvent extends Event { |
37 | - private string $userId; |
|
37 | + private string $userId; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @since 25.0.0 |
|
41 | - */ |
|
42 | - public function __construct(string $userId) { |
|
43 | - parent::__construct(); |
|
39 | + /** |
|
40 | + * @since 25.0.0 |
|
41 | + */ |
|
42 | + public function __construct(string $userId) { |
|
43 | + parent::__construct(); |
|
44 | 44 | |
45 | - $this->userId = $userId; |
|
46 | - } |
|
45 | + $this->userId = $userId; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @since 25.0.0 |
|
50 | - */ |
|
51 | - public function getUserId(): string { |
|
52 | - return $this->userId; |
|
53 | - } |
|
48 | + /** |
|
49 | + * @since 25.0.0 |
|
50 | + */ |
|
51 | + public function getUserId(): string { |
|
52 | + return $this->userId; |
|
53 | + } |
|
54 | 54 | } |
@@ -27,12 +27,12 @@ |
||
27 | 27 | /** @var array $_ */ |
28 | 28 | |
29 | 29 | script('settings', [ |
30 | - 'usersettings', |
|
31 | - 'templates', |
|
32 | - 'federationsettingsview', |
|
33 | - 'federationscopemenu', |
|
34 | - 'settings/personalInfo', |
|
35 | - 'vue-settings-personal-info', |
|
30 | + 'usersettings', |
|
31 | + 'templates', |
|
32 | + 'federationsettingsview', |
|
33 | + 'federationscopemenu', |
|
34 | + 'settings/personalInfo', |
|
35 | + 'vue-settings-personal-info', |
|
36 | 36 | ]); |
37 | 37 | ?> |
38 | 38 | <?php if (!$_['isFairUseOfFreePushService']) : ?> |
@@ -30,9 +30,9 @@ |
||
30 | 30 | * @since 25.0.0 |
31 | 31 | */ |
32 | 32 | interface IOptionWidget extends IWidget { |
33 | - /** |
|
34 | - * Get additional options for the widget |
|
35 | - * @since 25.0.0 |
|
36 | - */ |
|
37 | - public function getWidgetOptions(): WidgetOptions; |
|
33 | + /** |
|
34 | + * Get additional options for the widget |
|
35 | + * @since 25.0.0 |
|
36 | + */ |
|
37 | + public function getWidgetOptions(): WidgetOptions; |
|
38 | 38 | } |
@@ -29,33 +29,33 @@ |
||
29 | 29 | * @since 25.0.0 |
30 | 30 | */ |
31 | 31 | class WidgetOptions { |
32 | - private bool $roundItemIcons; |
|
32 | + private bool $roundItemIcons; |
|
33 | 33 | |
34 | - /** |
|
35 | - * @param bool $roundItemIcons |
|
36 | - * @since 25.0.0 |
|
37 | - */ |
|
38 | - public function __construct(bool $roundItemIcons) { |
|
39 | - $this->roundItemIcons = $roundItemIcons; |
|
40 | - } |
|
34 | + /** |
|
35 | + * @param bool $roundItemIcons |
|
36 | + * @since 25.0.0 |
|
37 | + */ |
|
38 | + public function __construct(bool $roundItemIcons) { |
|
39 | + $this->roundItemIcons = $roundItemIcons; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * Get the default set of options |
|
44 | - * |
|
45 | - * @return WidgetOptions |
|
46 | - * @since 25.0.0 |
|
47 | - */ |
|
48 | - public static function getDefault(): WidgetOptions { |
|
49 | - return new WidgetOptions(false); |
|
50 | - } |
|
42 | + /** |
|
43 | + * Get the default set of options |
|
44 | + * |
|
45 | + * @return WidgetOptions |
|
46 | + * @since 25.0.0 |
|
47 | + */ |
|
48 | + public static function getDefault(): WidgetOptions { |
|
49 | + return new WidgetOptions(false); |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * Whether the clients should render icons for widget items as round icons |
|
54 | - * |
|
55 | - * @return bool |
|
56 | - * @since 25.0.0 |
|
57 | - */ |
|
58 | - public function withRoundItemIcons(): bool { |
|
59 | - return $this->roundItemIcons; |
|
60 | - } |
|
52 | + /** |
|
53 | + * Whether the clients should render icons for widget items as round icons |
|
54 | + * |
|
55 | + * @return bool |
|
56 | + * @since 25.0.0 |
|
57 | + */ |
|
58 | + public function withRoundItemIcons(): bool { |
|
59 | + return $this->roundItemIcons; |
|
60 | + } |
|
61 | 61 | } |
@@ -39,22 +39,22 @@ |
||
39 | 39 | * @method string getToken() |
40 | 40 | */ |
41 | 41 | class OpenLocalEditor extends Entity { |
42 | - /** @var string */ |
|
43 | - protected $userId; |
|
42 | + /** @var string */ |
|
43 | + protected $userId; |
|
44 | 44 | |
45 | - /** @var string */ |
|
46 | - protected $pathHash; |
|
45 | + /** @var string */ |
|
46 | + protected $pathHash; |
|
47 | 47 | |
48 | - /** @var int */ |
|
49 | - protected $expirationTime; |
|
48 | + /** @var int */ |
|
49 | + protected $expirationTime; |
|
50 | 50 | |
51 | - /** @var string */ |
|
52 | - protected $token; |
|
51 | + /** @var string */ |
|
52 | + protected $token; |
|
53 | 53 | |
54 | - public function __construct() { |
|
55 | - $this->addType('userId', 'string'); |
|
56 | - $this->addType('pathHash', 'string'); |
|
57 | - $this->addType('expirationTime', 'integer'); |
|
58 | - $this->addType('token', 'string'); |
|
59 | - } |
|
54 | + public function __construct() { |
|
55 | + $this->addType('userId', 'string'); |
|
56 | + $this->addType('pathHash', 'string'); |
|
57 | + $this->addType('expirationTime', 'integer'); |
|
58 | + $this->addType('token', 'string'); |
|
59 | + } |
|
60 | 60 | } |