Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions-lock.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: MIT
c5893d7af1998af66d22f8c171ff4448 lint-info-xml.yml
023b664746d1f2e09a9aaaac772ff7f5 lint-info-xml.yml
870b483dbcbca59479211270d61546dd lint-php-cs.yml
ee2b04d185b82fe7dd6fe6d83c6c7b45 lint-php.yml
d676be1ed03142832d8e712962f5961c phpunit-mysql.yml
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/lint-info-xml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false
sparse-checkout: |
appinfo/

- name: Download schema
run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
}
},
"require-dev": {
"nextcloud/ocp": "dev-master"
"nextcloud/ocp": "dev-stable32"
},
"autoload-dev": {
"psr-4": {
Expand Down
59 changes: 29 additions & 30 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public function __construct(array $urlParams = []) {
/**
* @param IRegistrationContext $context
*/
#[\Override]
public function register(IRegistrationContext $context): void {
$context->registerCapability(PublicCapabilities::class);

Expand Down Expand Up @@ -103,6 +104,7 @@ function (GenericEvent $event) {
*
* @throws Throwable
*/
#[\Override]
public function boot(IBootContext $context): void {
$this->globalSiteSelector = $context->getAppContainer()->get(GlobalSiteSelector::class);
$this->logger = $context->getServerContainer()->get(LoggerInterface::class);
Expand Down
1 change: 1 addition & 0 deletions lib/BackgroundJobs/UpdateLookupServer.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public function __construct(
$this->setTimeSensitivity(IJob::TIME_SENSITIVE);
}

#[\Override]
protected function run($argument) {
if (!$this->globalSiteSelector->isSlave()) {
return;
Expand Down
2 changes: 2 additions & 0 deletions lib/Command/GlobalScaleDiscovery.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ public function __construct(
parent::__construct();
}

#[\Override]
protected function configure(): void {
parent::configure();
$this->setName('globalsiteselector:discovery')
->addOption('current', '', InputOption::VALUE_NONE, 'display current data')
->setDescription('run a discovery request over Global Scale to get details about each instances');
}

#[\Override]
protected function execute(InputInterface $input, OutputInterface $output): int {
if ($input->getOption('current')) {
$output->writeln(json_encode($this->appConfig->getValueArray(Application::APP_ID, ConfigLexicon::GS_TOKENS), JSON_PRETTY_PRINT));
Expand Down
2 changes: 2 additions & 0 deletions lib/Command/UsersUpdate.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public function __construct(Slave $slave) {
/**
*
*/
#[\Override]
protected function configure() {
parent::configure();
$this->setName('globalsiteselector:users:update')
Expand All @@ -40,6 +41,7 @@ protected function configure() {
*
* @return int
*/
#[\Override]
protected function execute(InputInterface $input, OutputInterface $output): int {
$this->slave->batchUpdate();

Expand Down
3 changes: 3 additions & 0 deletions lib/ConfigLexicon.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ class ConfigLexicon implements ILexicon {
public const GS_TOKENS = 'globalScaleTokens';
public const LOCAL_TOKEN = 'localToken';

#[\Override]
public function getStrictness(): Strictness {
return Strictness::IGNORE;
}

/**
* @inheritDoc
*/
#[\Override]
public function getAppConfigs(): array {
return [
new Entry(key: self::GS_TOKENS, type: ValueType::ARRAY, defaultRaw: [], definition: 'list of token+host to navigate through GlobalScale', lazy: true),
Expand All @@ -34,6 +36,7 @@ public function getAppConfigs(): array {
/**
* @inheritDoc
*/
#[\Override]
public function getUserConfigs(): array {
return [
];
Expand Down
1 change: 1 addition & 0 deletions lib/Listeners/AddContentSecurityPolicyListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function __construct(
) {
}

#[\Override]
public function handle(Event $event): void {
if (!$event instanceof AddContentSecurityPolicyEvent) {
return;
Expand Down
1 change: 1 addition & 0 deletions lib/Listeners/DeletingUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function __construct(
/**
* @param Event $event
*/
#[\Override]
public function handle(Event $event): void {
if (!$event instanceof BeforeUserDeletedEvent) {
return;
Expand Down
1 change: 1 addition & 0 deletions lib/Listeners/UserCreated.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public function __construct(
/**
* @param Event $event
*/
#[\Override]
public function handle(Event $event): void {
if (!$event instanceof UserCreatedEvent) {
return;
Expand Down
1 change: 1 addition & 0 deletions lib/Listeners/UserDeleted.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public function __construct(
/**
* @param Event $event
*/
#[\Override]
public function handle(Event $event): void {
if (!$event instanceof UserDeletedEvent) {
return;
Expand Down
1 change: 1 addition & 0 deletions lib/Listeners/UserLoggedOut.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function __construct(
/**
* @param Event $event
*/
#[\Override]
public function handle(Event $event): void {
if (!$event instanceof UserLoggedOutEvent) {
return;
Expand Down
1 change: 1 addition & 0 deletions lib/Listeners/UserLoggingIn.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public function __construct(
/**
* @param Event $event
*/
#[\Override]
public function handle(Event $event): void {
if (!$event instanceof BeforeUserLoggedInEvent) {
return;
Expand Down
1 change: 1 addition & 0 deletions lib/Migration/Version0110Date20180925143400.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Version0110Date20180925143400 extends SimpleMigrationStep {
* @return null|ISchemaWrapper
* @since 13.0.0
*/
#[\Override]
public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
/** @var ISchemaWrapper $schema */
$schema = $schemaClosure();
Expand Down
1 change: 1 addition & 0 deletions lib/Model/FederatedShare.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public function import(array $data): self {
/**
* @return array{id: int, fileId: int, shareType: int, shareWith: string, permissions: int, target: array, remote: string, remoteId: int}
*/
#[\Override]
public function jsonSerialize(): array {
if ($this->isBounce()) {
return [
Expand Down
1 change: 1 addition & 0 deletions lib/Model/LocalFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public function import(array $data): self {
/**
* @return array{id: int, name: string, storageId: int, parent: int, path: string[]}
*/
#[\Override]
public function jsonSerialize(): array {
return [
'id' => $this->getId(),
Expand Down
1 change: 1 addition & 0 deletions lib/Model/LocalMount.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public function getUserId(): string {
/**
* @return array{provider: string, mountPoint: string, userId: string}
*/
#[\Override]
public function jsonSerialize(): array {
return [
'provider' => $this->getProviderClass(),
Expand Down
1 change: 1 addition & 0 deletions lib/PublicCapabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public function __construct(
) {

}
#[\Override]
public function getCapabilities(): array {
return [
'globalscale' => [
Expand Down
3 changes: 3 additions & 0 deletions lib/SetupChecks/LongJwtKeySetupCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@ public function __construct(
) {
}

#[\Override]
public function getName(): string {
return 'Globalscale Jwt key';
}

#[\Override]
public function getCategory(): string {
return 'globalscale';
}

#[\Override]
public function run(): SetupResult {
if (strlen($this->gss->getJwtKey()) > 31) {
return SetupResult::success('gss.jwt.key is set to a long enough string');
Expand Down
Loading
Loading