Merge pull request #171 from nextcloud/upgrade-composer

composer upgrade
nextcloud · Feb 17, 2025 · 7cc50fc · 7cc50fc
2 parents 9b1d533 + 16d16de
commit 7cc50fc
Show file tree

Hide file tree

Showing 38 changed files with 756 additions and 649 deletions.
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
@@ -84,7 +84,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "classmap-authoritative": true,
         "autoloader-suffix": "GlobalSiteSelector",
         "platform": {
-            "php": "8.0"
+            "php": "8.2"
         },
         "sort-packages": true
     },

diff --git a/composer.lock b/composer.lock
diff --git a/lib/BackgroundJobs/UpdateLookupServer.php b/lib/BackgroundJobs/UpdateLookupServer.php
@@ -23,7 +23,7 @@ public function __construct(
 		ITimeFactory $time,
 		IConfig $config,
 		private GlobalSiteSelector $globalSiteSelector,
-		private Slave $slave
+		private Slave $slave,
 	) {
 		parent::__construct($time);
 

diff --git a/lib/Command/UsersUpdate.php b/lib/Command/UsersUpdate.php
@@ -30,7 +30,7 @@ public function __construct(Slave $slave) {
 	protected function configure() {
 		parent::configure();
 		$this->setName('globalsiteselector:users:update')
-			 ->setDescription('update known users data to Lookup Server');
+			->setDescription('update known users data to Lookup Server');
 	}
 
 

diff --git a/lib/Controller/MasterController.php b/lib/Controller/MasterController.php
@@ -42,7 +42,7 @@ public function __construct(
 		ISession $session,
 		GlobalSiteSelector $globalSiteSelector,
 		Master $master,
-		LoggerInterface $logger
+		LoggerInterface $logger,
 	) {
 		parent::__construct($appName, $request);
 

diff --git a/lib/Controller/SlaveController.php b/lib/Controller/SlaveController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -86,7 +87,7 @@ public function autoLogin(string $jwt): RedirectResponse {
 		}
 
 		try {
-			list($uid, $password, $options) = $this->decodeJwt($jwt);
+			[$uid, $password, $options] = $this->decodeJwt($jwt);
 			$this->logger->debug('uid: ' . $uid . ', options: ' . json_encode($options));
 
 			$target = $options['target'];
@@ -162,15 +163,15 @@ public function createAppToken($jwt) {
 		}
 
 		try {
-			list($uid, $password, $options) = $this->decodeJwt($jwt);
+			[$uid, $password, $options] = $this->decodeJwt($jwt);
 			$saml = (($options['backend'] ?? '') === 'saml');
 			if ($saml) {
 				$this->autoprovisionIfNeeded($uid, $options);
 			}
 
 			if ($this->userManager->userExists($uid)) {
 				// if we have a password, we verify it; if not it means we should be using saml.
-				$result = ('' === $password) ? $saml : $this->userSession->login($uid, $password);
+				$result = ($password === '') ? $saml : $this->userSession->login($uid, $password);
 				if ($result) {
 					$token = $this->tokenHandler->generateAppToken($uid);
 

diff --git a/lib/GlobalSiteSelector.php b/lib/GlobalSiteSelector.php
@@ -24,7 +24,7 @@ class GlobalSiteSelector {
 	public const SLAVE = 'slave';
 
 
-	/** @var  IConfig */
+	/** @var IConfig */
 	private $config;
 
 	/**

diff --git a/lib/Listeners/AddContentSecurityPolicyListener.php b/lib/Listeners/AddContentSecurityPolicyListener.php
@@ -25,7 +25,7 @@ class AddContentSecurityPolicyListener implements IEventListener {
 	public function __construct(
 		private IConfig $config,
 		private IUserSession $userSession,
-		private IRequest $request
+		private IRequest $request,
 	) {
 	}
 

diff --git a/lib/Listeners/DeletingUser.php b/lib/Listeners/DeletingUser.php
@@ -22,7 +22,8 @@ class DeletingUser implements IEventListener {
 
 	public function __construct(
 		private GlobalSiteSelector $globalSiteSelector,
-		private Slave $slave) {
+		private Slave $slave,
+	) {
 	}
 
 	/**

diff --git a/lib/Listeners/UserDeleted.php b/lib/Listeners/UserDeleted.php
@@ -22,7 +22,7 @@ class UserDeleted implements IEventListener {
 
 	public function __construct(
 		private GlobalSiteSelector $globalSiteSelector,
-		private Slave $slave
+		private Slave $slave,
 	) {
 	}
 

diff --git a/lib/Listeners/UserLoggedOut.php b/lib/Listeners/UserLoggedOut.php
@@ -22,7 +22,7 @@ class UserLoggedOut implements IEventListener {
 
 	public function __construct(
 		private GlobalSiteSelector $globalSiteSelector,
-		private Slave $slave
+		private Slave $slave,
 	) {
 	}
 

diff --git a/lib/Listeners/UserLoggingIn.php b/lib/Listeners/UserLoggingIn.php
@@ -24,7 +24,7 @@ class UserLoggingIn implements IEventListener {
 	public function __construct(
 		private GlobalSiteSelector $globalSiteSelector,
 		private Master $master,
-		private LoggerInterface $logger
+		private LoggerInterface $logger,
 	) {
 	}
 

diff --git a/lib/Lookup.php b/lib/Lookup.php
@@ -22,7 +22,7 @@ public function __construct(
 		private IClientService $clientService,
 		private LoggerInterface $logger,
 		private ICloudIdManager $cloudIdManager,
-		private IConfig $config
+		private IConfig $config,
 	) {
 		$this->lookupServerUrl = $this->config->getSystemValueString('lookup_server', '');
 	}

diff --git a/lib/Master.php b/lib/Master.php
@@ -51,7 +51,7 @@ public function __construct(
 		IRequest $request,
 		IClientService $clientService,
 		IConfig $config,
-		LoggerInterface $logger
+		LoggerInterface $logger,
 	) {
 		$this->session = $session;
 		$this->gss = $gss;
@@ -78,7 +78,7 @@ public function __construct(
 	public function handleLoginRequest(
 		string $uid,
 		?string $password,
-		?IApacheBackend $backend = null
+		?IApacheBackend $backend = null,
 	): void {
 		$this->logger->debug(
 			'start handle login request',

diff --git a/lib/Migration/Version0110Date20180925143400.php b/lib/Migration/Version0110Date20180925143400.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Service/SlaveService.php b/lib/Service/SlaveService.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -45,7 +46,7 @@ public function __construct(
 		IConfig $config,
 		Lookup $lookup,
 		GlobalSiteSelector $gss,
-		ICacheFactory $cacheFactory
+		ICacheFactory $cacheFactory,
 	) {
 		$this->logger = $logger;
 		$this->clientService = $clientService;

diff --git a/lib/Slave.php b/lib/Slave.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -41,7 +42,7 @@ public function __construct(
 		Lookup $lookup,
 		GlobalSiteSelector $gss,
 		LoggerInterface $logger,
-		IConfig $config
+		IConfig $config,
 	) {
 		$this->userManager = $userManager;
 		$this->clientService = $clientService;

diff --git a/lib/TokenHandler.php b/lib/TokenHandler.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -21,7 +22,7 @@ class TokenHandler {
 
 	public function __construct(
 		private IProvider $tokenProvider,
-		private ISecureRandom $random
+		private ISecureRandom $random,
 	) {
 	}
 
@@ -34,7 +35,7 @@ public function __construct(
 	 */
 	public function generateAppToken($uid) {
 		// generate random token
-		$token = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
+		$token = $this->random->generate(72, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
 		$deviceToken = $this->tokenProvider->generateToken($token, $uid, $uid, null, 'Client login', IToken::PERMANENT_TOKEN);
 		$tokenData = $deviceToken->jsonSerialize();