Bump firebase/php-jwt from 6.11.0 to 7.0.0

.gitignore

@@ -59,3 +59,5 @@ nbproject
 clover.xml
 
 /.php_cs.cache
+
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -1,25 +1,23 @@
 <?php
 
 declare(strict_types=1);
-
 /**
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
 require_once './vendor-bin/csfixer/vendor/autoload.php';
 
 use Nextcloud\CodingStandard\Config;
 
 $config = new Config();
 $config
 	->getFinder()
+	->ignoreVCSIgnored(true)
 	->notPath('build')
 	->notPath('tests/stubs')
 	->notPath('l10n')
 	->notPath('src')
 	->notPath('vendor')
-	->notPath('vendor-bin')
 	->notPath('lib/Vendor')
 	->in(__DIR__);
 return $config;

appinfo/routes.php

@@ -5,7 +5,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-
 return [
 	'ocs' => [
 		['name' => 'Slave#createAppToken', 'url' => '/v1/createapptoken', 'verb' => 'GET'],

composer.json

@@ -46,7 +46,7 @@
     },
     "require": {
         "bamarni/composer-bin-plugin": "^1.8",
-        "firebase/php-jwt": "^6.8"
+        "firebase/php-jwt": "^7.0"
     },
     "extra": {
         "bamarni-bin": {
@@ -65,7 +65,7 @@
         }
     },
     "require-dev": {
-        "nextcloud/ocp": "dev-master"
+        "nextcloud/ocp": "dev-stable32"
     },
     "autoload-dev": {
         "psr-4": {

lib/AppInfo/Application.php

@@ -61,10 +61,10 @@ public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
 	}
 
-
 	/**
 	 * @param IRegistrationContext $context
 	 */
+	#[\Override]
 	public function register(IRegistrationContext $context): void {
 		$context->registerCapability(PublicCapabilities::class);
 
@@ -97,12 +97,12 @@ function (GenericEvent $event) {
 		);
 	}
 
-
 	/**
 	 * @param IBootContext $context
 	 *
 	 * @throws Throwable
 	 */
+	#[\Override]
 	public function boot(IBootContext $context): void {
 		$this->globalSiteSelector = $context->getAppContainer()->get(GlobalSiteSelector::class);
 		$this->logger = $context->getServerContainer()->get(LoggerInterface::class);
@@ -111,7 +111,6 @@ public function boot(IBootContext $context): void {
 		$context->injectFn(Closure::fromCallable([$this, 'redirectToMasterLogin']));
 	}
 
-
 	/**
 	 * Register the Global Scale User Backend if we run in slave mode
 	 */
@@ -139,7 +138,6 @@ private function registerUserBackendForSlave() {
 		$this->logger->debug('gss UserBackend registered', ['app' => self::APP_ID]);
 	}
 
-
 	/**
 	 * Register the Global Scale User Backend if we run in slave mode
 	 */

lib/BackgroundJobs/UpdateLookupServer.php

@@ -6,6 +6,7 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\GlobalSiteSelector\BackgroundJobs;
 
 use OCA\GlobalSiteSelector\GlobalSiteSelector;
@@ -30,6 +31,7 @@ public function __construct(
 		$this->setTimeSensitivity(IJob::TIME_SENSITIVE);
 	}
 
+	#[\Override]
 	protected function run($argument) {
 		if (!$this->globalSiteSelector->isSlave()) {
 			return;

lib/Command/GlobalScaleDiscovery.php

@@ -6,6 +6,7 @@
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\GlobalSiteSelector\Command;
 
 use OC\Core\Command\Base;
@@ -25,13 +26,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));

lib/Command/UsersUpdate.php

@@ -23,23 +23,23 @@ public function __construct(Slave $slave) {
 		$this->slave = $slave;
 	}
 
-
 	/**
 	 *
 	 */
+	#[\Override]
 	protected function configure() {
 		parent::configure();
 		$this->setName('globalsiteselector:users:update')
 			->setDescription('update known users data to Lookup Server');
 	}
 
-
 	/**
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
 	 *
 	 * @return int
 	 */
+	#[\Override]
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$this->slave->batchUpdate();
 

lib/ConfigLexicon.php

@@ -6,6 +6,7 @@
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\GlobalSiteSelector;
 
 use OCP\Config\Lexicon\Entry;
@@ -17,13 +18,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),
@@ -34,6 +37,7 @@ public function getAppConfigs(): array {
 	/**
 	 * @inheritDoc
 	 */
+	#[\Override]
 	public function getUserConfigs(): array {
 		return [
 		];

lib/Controller/MasterController.php

@@ -1,12 +1,10 @@
 <?php
 
-
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-
 namespace OCA\GlobalSiteSelector\Controller;
 
 use OCA\GlobalSiteSelector\AppInfo\Application;

lib/Controller/SlaveController.php

@@ -5,7 +5,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-
 namespace OCA\GlobalSiteSelector\Controller;
 
 use OC\Authentication\Token\IProvider;
@@ -123,7 +122,6 @@ public function sharedFile(string $jwt): DataResponse {
 		}
 	}
 
-
 	#[PublicPage]
 	#[NoCSRFRequired]
 	#[UseSession]
@@ -289,7 +287,6 @@ protected function decodeJwt($jwt) {
 		return [$uid, $password, json_decode($options, true)];
 	}
 
-
 	/**
 	 * create new user if the user doesn't exist yet on the client node
 	 *

lib/GlobalSiteSelector.php

@@ -23,7 +23,6 @@ class GlobalSiteSelector {
 	public const MASTER = 'master';
 	public const SLAVE = 'slave';
 
-
 	/** @var IConfig */
 	private $config;
 
@@ -59,7 +58,6 @@ public function isSlave(): bool {
 		return ($this->getMode() === self::SLAVE);
 	}
 
-
 	/**
 	 * get JWT key
 	 *
@@ -70,7 +68,6 @@ public function getJwtKey(): string {
 		return $this->config->getSystemValueString('gss.jwt.key', '');
 	}
 
-
 	/**
 	 * get the URL of the global site selector master
 	 *
@@ -86,7 +83,6 @@ public function getMasterUrl(): string {
 		return $masterUrl;
 	}
 
-
 	/**
 	 * get lookup server URL
 	 *

lib/Listeners/AddContentSecurityPolicyListener.php

@@ -29,6 +29,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!$event instanceof AddContentSecurityPolicyEvent) {
 			return;

lib/Listeners/DeletingUser.php

@@ -29,6 +29,7 @@ public function __construct(
 	/**
 	 * @param Event $event
 	 */
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!$event instanceof BeforeUserDeletedEvent) {
 			return;

lib/Listeners/UserCreated.php

@@ -26,10 +26,10 @@ public function __construct(
 	) {
 	}
 
-
 	/**
 	 * @param Event $event
 	 */
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!$event instanceof UserCreatedEvent) {
 			return;