Merge pull request #12455 from nextcloud/twofactor-backup-settings

rullzer · web-flow · commit 1783fa717651 · 2018-11-14T19:35:13.000+01:00
Don't register twofactor_backup settings as "regular" settings
diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml
@@ -26,10 +26,6 @@
 		<provider>OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider</provider>
 	</two-factor-providers>
 
-	<settings>
-		<personal>OCA\TwoFactorBackupCodes\Settings\Personal</personal>
-	</settings>
-
 	<activity>
 		<providers>
 			<provider>OCA\TwoFactorBackupCodes\Activity\Provider</provider>
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
@@ -167,7 +167,7 @@ protected function getSettings(string $type, string $section): array {
 			}
 
 			if (!$setting instanceof ISettings) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]);
+				$this->log->logException(new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')'), ['level' => ILogger::INFO]);
 				continue;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ protected function getSettings(string $type, string $section): array {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`if (!$setting instanceof ISettings) {`
`170`		`- $this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]);`
	`170`	`+ $this->log->logException(new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')'), ['level' => ILogger::INFO]);`
`171`	`171`	`continue;`
`172`	`172`	`}`
`173`	`173`