Merge pull request #1100 from nextcloud/bugfix/noid/dont-break-hard

fix(config): Fix constructor of config class

.github/workflows/lint-php-cs.yml

@@ -41,4 +41,4 @@ jobs:
         run: composer i
 
       - name: Lint
-        run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
+        run: PHP_CS_FIXER_IGNORE_ENV=1 composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

appinfo/info.xml

@@ -9,7 +9,7 @@
 Guests accounts can be created from the share menu by entering either the recipients email or name and choosing "create guest account", once the share is created the guest user will receive an email notification about the mail with a link to set their password.
 
 Guests users can only access files shared to them and cannot create any files outside of shares, additionally, the apps accessible to guest accounts are whitelisted.]]></description>
-	<version>3.0.1</version>
+	<version>3.1.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<types>
@@ -26,7 +26,7 @@ Guests users can only access files shared to them and cannot create any files ou
 	<screenshot>https://raw.githubusercontent.com/nextcloud/guests/master/screenshots/settings.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/guests/master/screenshots/dropdown.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="28" max-version="28" />
+		<nextcloud min-version="29" max-version="29" />
 	</dependencies>
 	<commands>
 		<command>OCA\Guests\Command\ListCommand</command>

lib/AppConfigOverwrite.php

@@ -24,18 +24,20 @@
 namespace OCA\Guests;
 
 use OC\AppConfig;
-use OC\DB\ConnectionAdapter;
+use OCP\IDBConnection;
+use Psr\Log\LoggerInterface;
 
 class AppConfigOverwrite extends AppConfig {
 
 	/** @var string[][] */
 	private $overWrite;
 
 	public function __construct(
-		ConnectionAdapter $conn,
+		IDBConnection $connection,
+		LoggerInterface $logger,
 		array $overWrite
 	) {
-		parent::__construct($conn->getInner());
+		parent::__construct($connection, $logger);
 		$this->overWrite = $overWrite;
 	}
 

lib/RestrictionManager.php

@@ -33,6 +33,7 @@
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Settings\IManager;
+use Psr\Log\LoggerInterface;
 
 class RestrictionManager {
 	/** @var AppWhitelist */
@@ -119,11 +120,15 @@ public function lateSetupRestrictions(): void {
 				$this->userBackend->setAllowListing(false);
 
 				$this->server->registerService(AppConfig::class, function () {
-					return new AppConfigOverwrite($this->server->get(IDBConnection::class), [
-						'core' => [
-							'shareapi_only_share_with_group_members' => 'yes'
+					return new AppConfigOverwrite(
+						$this->server->get(IDBConnection::class),
+						$this->server->get(LoggerInterface::class),
+						[
+							'core' => [
+								'shareapi_only_share_with_group_members' => 'yes'
+							]
 						]
-					]);
+					);
 				});
 			}
 		}

tests/stub.php

@@ -130,8 +130,15 @@ public function setUnreadCounter(string $id, int $unreadCounter): void {
 	}
 
 	class AppConfig {
-		public function __construct(\OC\DB\Connection $connection) {
+		public function __construct(
+			protected \OCP\IDBConnection $connection,
+			private \Psr\Log\LoggerInterface $logger,
+		) {
 		}
+
+		/**
+		 * @deprecated - use getValue*()
+		 */
 		public function getValue(string $app, string $key, string $default = null): string {
 		}
 	}