nextcloud / server

lib/private/Repair/ConfigKeyMigration.php

Indentation +10 added lines, -10 removed lines

@@ -14,16 +14,16 @@
 use OCP\Migration\IRepairStep;
 
 class ConfigKeyMigration implements IRepairStep {
-	public function __construct(
-		private ConfigManager $configManager,
-	) {
-	}
+    public function __construct(
+        private ConfigManager $configManager,
+    ) {
+    }
 
-	public function getName(): string {
-		return 'Migrate config keys';
-	}
+    public function getName(): string {
+        return 'Migrate config keys';
+    }
 
-	public function run(IOutput $output) {
-		$this->configManager->migrateConfigLexiconKeys();
-	}
+    public function run(IOutput $output) {
+        $this->configManager->migrateConfigLexiconKeys();
+    }
 }

core/Command/Config/App/Base.php

Indentation +21 added lines, -21 removed lines

@@ -12,27 +12,27 @@
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 
 abstract class Base extends \OC\Core\Command\Base {
-	public function __construct(
-		protected IAppConfig $appConfig,
-		protected readonly ConfigManager $configManager,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IAppConfig $appConfig,
+        protected readonly ConfigManager $configManager,
+    ) {
+        parent::__construct();
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return $this->appConfig->getApps();
-		}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return $this->appConfig->getApps();
+        }
 
-		if ($argumentName === 'name') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-			return $this->appConfig->getKeys($appName);
-		}
-		return [];
-	}
+        if ($argumentName === 'name') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+            return $this->appConfig->getKeys($appName);
+        }
+        return [];
+    }
 }

core/Command/Config/App/SetConfig.php

Indentation +211 added lines, -211 removed lines

@@ -19,215 +19,215 @@
 use Symfony\Component\Console\Question\Question;
 
 class SetConfig extends Base {
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:app:set')
-			->setDescription('Set an app config value')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'Name of the config to set'
-			)
-			->addOption(
-				'value',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'The new value of the config'
-			)
-			->addOption(
-				'type',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'Value type [string, integer, float, boolean, array]',
-				'string'
-			)
-			->addOption(
-				'lazy',
-				null,
-				InputOption::VALUE_NEGATABLE,
-				'Set value as lazy loaded',
-			)
-			->addOption(
-				'sensitive',
-				null,
-				InputOption::VALUE_NEGATABLE,
-				'Set value as sensitive',
-			)
-			->addOption(
-				'update-only',
-				null,
-				InputOption::VALUE_NONE,
-				'Only updates the value, if it is not set before, it is not being added'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
-
-		if (!($this->appConfig instanceof AppConfig)) {
-			throw new \Exception('Only compatible with OC\AppConfig as it uses internal methods');
-		}
-
-		if ($input->hasParameterOption('--update-only') && !$this->appConfig->hasKey($appName, $configName)) {
-			$output->writeln(
-				'<comment>Config value ' . $configName . ' for app ' . $appName
-				. ' not updated, as it has not been set before.</comment>'
-			);
-
-			return 1;
-		}
-
-		$type = $typeString = null;
-		if ($input->hasParameterOption('--type')) {
-			$typeString = $input->getOption('type');
-			$type = $this->appConfig->convertTypeToInt($typeString);
-		}
-
-		/**
-		 * If --Value is not specified, returns an exception if no value exists in database
-		 * compare with current status in database and displays a reminder that this can break things.
-		 * confirmation is required by admin, unless --no-interaction
-		 */
-		$updated = false;
-		if (!$input->hasParameterOption('--value')) {
-			if (!$input->getOption('lazy') && $this->appConfig->isLazy($appName, $configName) && $this->ask($input, $output, 'NOT LAZY')) {
-				$updated = $this->appConfig->updateLazy($appName, $configName, false);
-			}
-			if ($input->getOption('lazy') && !$this->appConfig->isLazy($appName, $configName) && $this->ask($input, $output, 'LAZY')) {
-				$updated = $this->appConfig->updateLazy($appName, $configName, true) || $updated;
-			}
-			if (!$input->getOption('sensitive') && $this->appConfig->isSensitive($appName, $configName) && $this->ask($input, $output, 'NOT SENSITIVE')) {
-				$updated = $this->appConfig->updateSensitive($appName, $configName, false) || $updated;
-			}
-			if ($input->getOption('sensitive') && !$this->appConfig->isSensitive($appName, $configName) && $this->ask($input, $output, 'SENSITIVE')) {
-				$updated = $this->appConfig->updateSensitive($appName, $configName, true) || $updated;
-			}
-			if ($type !== null && $type !== $this->appConfig->getValueType($appName, $configName) && $typeString !== null && $this->ask($input, $output, $typeString)) {
-				$updated = $this->appConfig->updateType($appName, $configName, $type) || $updated;
-			}
-		} else {
-			/**
-			 * If --type is specified in the command line, we upgrade the type in database
-			 * after a confirmation from admin.
-			 * If not we get the type from current stored value or VALUE_MIXED as default.
-			 */
-			try {
-				$currType = $this->appConfig->getValueType($appName, $configName);
-				if ($type === null || $typeString === null || $type === $currType || !$this->ask($input, $output, $typeString)) {
-					$type = $currType;
-				} else {
-					$updated = $this->appConfig->updateType($appName, $configName, $type);
-				}
-			} catch (AppConfigUnknownKeyException) {
-				$type = $type ?? IAppConfig::VALUE_MIXED;
-			}
-
-			/**
-			 * if --lazy/--no-lazy option are set, compare with data stored in database.
-			 * If no data in database, or identical, continue.
-			 * If different, ask admin for confirmation.
-			 */
-			$lazy = $input->getOption('lazy');
-			try {
-				$currLazy = $this->appConfig->isLazy($appName, $configName);
-				if ($lazy === null || $lazy === $currLazy || !$this->ask($input, $output, ($lazy) ? 'LAZY' : 'NOT LAZY')) {
-					$lazy = $currLazy;
-				}
-			} catch (AppConfigUnknownKeyException) {
-				$lazy = $lazy ?? false;
-			}
-
-			/**
-			 * same with sensitive status
-			 */
-			$sensitive = $input->getOption('sensitive');
-			try {
-				$currSensitive = $this->appConfig->isSensitive($appName, $configName, null);
-				if ($sensitive === null || $sensitive === $currSensitive || !$this->ask($input, $output, ($sensitive) ? 'SENSITIVE' : 'NOT SENSITIVE')) {
-					$sensitive = $currSensitive;
-				}
-			} catch (AppConfigUnknownKeyException) {
-				$sensitive = $sensitive ?? false;
-			}
-
-			$value = (string)$input->getOption('value');
-			switch ($type) {
-				case IAppConfig::VALUE_MIXED:
-					$updated = $this->appConfig->setValueMixed($appName, $configName, $value, $lazy, $sensitive);
-					break;
-
-				case IAppConfig::VALUE_STRING:
-					$updated = $this->appConfig->setValueString($appName, $configName, $value, $lazy, $sensitive);
-					break;
-
-				case IAppConfig::VALUE_INT:
-					$updated = $this->appConfig->setValueInt($appName, $configName, $this->configManager->convertToInt($value), $lazy, $sensitive);
-					break;
-
-				case IAppConfig::VALUE_FLOAT:
-					$updated = $this->appConfig->setValueFloat($appName, $configName, $this->configManager->convertToFloat($value), $lazy, $sensitive);
-					break;
-
-				case IAppConfig::VALUE_BOOL:
-					$updated = $this->appConfig->setValueBool($appName, $configName, $this->configManager->convertToBool($value), $lazy);
-					break;
-
-				case IAppConfig::VALUE_ARRAY:
-					$updated = $this->appConfig->setValueArray($appName, $configName, $this->configManager->convertToArray($value), $lazy, $sensitive);
-					break;
-			}
-		}
-
-		if ($updated) {
-			$current = $this->appConfig->getDetails($appName, $configName);
-			$output->writeln(
-				sprintf(
-					"<info>Config value '%s' for app '%s' is now set to '%s', stored as %s in %s</info>",
-					$configName,
-					$appName,
-					$current['sensitive'] ? '<sensitive>' : $current['value'],
-					$current['typeString'],
-					$current['lazy'] ? 'lazy cache' : 'fast cache'
-				)
-			);
-		} else {
-			$output->writeln('<info>Config value were not updated</info>');
-		}
-
-		return 0;
-	}
-
-	private function ask(InputInterface $input, OutputInterface $output, string $request): bool {
-		/** @var QuestionHelper $helper */
-		$helper = $this->getHelper('question');
-		if ($input->getOption('no-interaction')) {
-			return true;
-		}
-
-		$output->writeln(sprintf('You are about to set config value %s as <info>%s</info>',
-			'<info>' . $input->getArgument('app') . '</info>/<info>' . $input->getArgument('name') . '</info>',
-			strtoupper($request)
-		));
-		$output->writeln('');
-		$output->writeln('<comment>This might break thing, affect performance on your instance or its security!</comment>');
-
-		$result = (strtolower((string)$helper->ask(
-			$input,
-			$output,
-			new Question('<comment>Confirm this action by typing \'yes\'</comment>: '))) === 'yes');
-
-		$output->writeln(($result) ? 'done' : 'cancelled');
-		$output->writeln('');
-
-		return $result;
-	}
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:app:set')
+            ->setDescription('Set an app config value')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'Name of the config to set'
+            )
+            ->addOption(
+                'value',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The new value of the config'
+            )
+            ->addOption(
+                'type',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Value type [string, integer, float, boolean, array]',
+                'string'
+            )
+            ->addOption(
+                'lazy',
+                null,
+                InputOption::VALUE_NEGATABLE,
+                'Set value as lazy loaded',
+            )
+            ->addOption(
+                'sensitive',
+                null,
+                InputOption::VALUE_NEGATABLE,
+                'Set value as sensitive',
+            )
+            ->addOption(
+                'update-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Only updates the value, if it is not set before, it is not being added'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
+
+        if (!($this->appConfig instanceof AppConfig)) {
+            throw new \Exception('Only compatible with OC\AppConfig as it uses internal methods');
+        }
+
+        if ($input->hasParameterOption('--update-only') && !$this->appConfig->hasKey($appName, $configName)) {
+            $output->writeln(
+                '<comment>Config value ' . $configName . ' for app ' . $appName
+                . ' not updated, as it has not been set before.</comment>'
+            );
+
+            return 1;
+        }
+
+        $type = $typeString = null;
+        if ($input->hasParameterOption('--type')) {
+            $typeString = $input->getOption('type');
+            $type = $this->appConfig->convertTypeToInt($typeString);
+        }
+
+        /**
+         * If --Value is not specified, returns an exception if no value exists in database
+         * compare with current status in database and displays a reminder that this can break things.
+         * confirmation is required by admin, unless --no-interaction
+         */
+        $updated = false;
+        if (!$input->hasParameterOption('--value')) {
+            if (!$input->getOption('lazy') && $this->appConfig->isLazy($appName, $configName) && $this->ask($input, $output, 'NOT LAZY')) {
+                $updated = $this->appConfig->updateLazy($appName, $configName, false);
+            }
+            if ($input->getOption('lazy') && !$this->appConfig->isLazy($appName, $configName) && $this->ask($input, $output, 'LAZY')) {
+                $updated = $this->appConfig->updateLazy($appName, $configName, true) || $updated;
+            }
+            if (!$input->getOption('sensitive') && $this->appConfig->isSensitive($appName, $configName) && $this->ask($input, $output, 'NOT SENSITIVE')) {
+                $updated = $this->appConfig->updateSensitive($appName, $configName, false) || $updated;
+            }
+            if ($input->getOption('sensitive') && !$this->appConfig->isSensitive($appName, $configName) && $this->ask($input, $output, 'SENSITIVE')) {
+                $updated = $this->appConfig->updateSensitive($appName, $configName, true) || $updated;
+            }
+            if ($type !== null && $type !== $this->appConfig->getValueType($appName, $configName) && $typeString !== null && $this->ask($input, $output, $typeString)) {
+                $updated = $this->appConfig->updateType($appName, $configName, $type) || $updated;
+            }
+        } else {
+            /**
+             * If --type is specified in the command line, we upgrade the type in database
+             * after a confirmation from admin.
+             * If not we get the type from current stored value or VALUE_MIXED as default.
+             */
+            try {
+                $currType = $this->appConfig->getValueType($appName, $configName);
+                if ($type === null || $typeString === null || $type === $currType || !$this->ask($input, $output, $typeString)) {
+                    $type = $currType;
+                } else {
+                    $updated = $this->appConfig->updateType($appName, $configName, $type);
+                }
+            } catch (AppConfigUnknownKeyException) {
+                $type = $type ?? IAppConfig::VALUE_MIXED;
+            }
+
+            /**
+             * if --lazy/--no-lazy option are set, compare with data stored in database.
+             * If no data in database, or identical, continue.
+             * If different, ask admin for confirmation.
+             */
+            $lazy = $input->getOption('lazy');
+            try {
+                $currLazy = $this->appConfig->isLazy($appName, $configName);
+                if ($lazy === null || $lazy === $currLazy || !$this->ask($input, $output, ($lazy) ? 'LAZY' : 'NOT LAZY')) {
+                    $lazy = $currLazy;
+                }
+            } catch (AppConfigUnknownKeyException) {
+                $lazy = $lazy ?? false;
+            }
+
+            /**
+             * same with sensitive status
+             */
+            $sensitive = $input->getOption('sensitive');
+            try {
+                $currSensitive = $this->appConfig->isSensitive($appName, $configName, null);
+                if ($sensitive === null || $sensitive === $currSensitive || !$this->ask($input, $output, ($sensitive) ? 'SENSITIVE' : 'NOT SENSITIVE')) {
+                    $sensitive = $currSensitive;
+                }
+            } catch (AppConfigUnknownKeyException) {
+                $sensitive = $sensitive ?? false;
+            }
+
+            $value = (string)$input->getOption('value');
+            switch ($type) {
+                case IAppConfig::VALUE_MIXED:
+                    $updated = $this->appConfig->setValueMixed($appName, $configName, $value, $lazy, $sensitive);
+                    break;
+
+                case IAppConfig::VALUE_STRING:
+                    $updated = $this->appConfig->setValueString($appName, $configName, $value, $lazy, $sensitive);
+                    break;
+
+                case IAppConfig::VALUE_INT:
+                    $updated = $this->appConfig->setValueInt($appName, $configName, $this->configManager->convertToInt($value), $lazy, $sensitive);
+                    break;
+
+                case IAppConfig::VALUE_FLOAT:
+                    $updated = $this->appConfig->setValueFloat($appName, $configName, $this->configManager->convertToFloat($value), $lazy, $sensitive);
+                    break;
+
+                case IAppConfig::VALUE_BOOL:
+                    $updated = $this->appConfig->setValueBool($appName, $configName, $this->configManager->convertToBool($value), $lazy);
+                    break;
+
+                case IAppConfig::VALUE_ARRAY:
+                    $updated = $this->appConfig->setValueArray($appName, $configName, $this->configManager->convertToArray($value), $lazy, $sensitive);
+                    break;
+            }
+        }
+
+        if ($updated) {
+            $current = $this->appConfig->getDetails($appName, $configName);
+            $output->writeln(
+                sprintf(
+                    "<info>Config value '%s' for app '%s' is now set to '%s', stored as %s in %s</info>",
+                    $configName,
+                    $appName,
+                    $current['sensitive'] ? '<sensitive>' : $current['value'],
+                    $current['typeString'],
+                    $current['lazy'] ? 'lazy cache' : 'fast cache'
+                )
+            );
+        } else {
+            $output->writeln('<info>Config value were not updated</info>');
+        }
+
+        return 0;
+    }
+
+    private function ask(InputInterface $input, OutputInterface $output, string $request): bool {
+        /** @var QuestionHelper $helper */
+        $helper = $this->getHelper('question');
+        if ($input->getOption('no-interaction')) {
+            return true;
+        }
+
+        $output->writeln(sprintf('You are about to set config value %s as <info>%s</info>',
+            '<info>' . $input->getArgument('app') . '</info>/<info>' . $input->getArgument('name') . '</info>',
+            strtoupper($request)
+        ));
+        $output->writeln('');
+        $output->writeln('<comment>This might break thing, affect performance on your instance or its security!</comment>');
+
+        $result = (strtolower((string)$helper->ask(
+            $input,
+            $output,
+            new Question('<comment>Confirm this action by typing \'yes\'</comment>: '))) === 'yes');
+
+        $output->writeln(($result) ? 'done' : 'cancelled');
+        $output->writeln('');
+
+        return $result;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
 
 		if ($input->hasParameterOption('--update-only') && !$this->appConfig->hasKey($appName, $configName)) {
 			$output->writeln(
-				'<comment>Config value ' . $configName . ' for app ' . $appName
+				'<comment>Config value '.$configName.' for app '.$appName
 				. ' not updated, as it has not been set before.</comment>'
 			);
 
@@ -159,7 +159,7 @@ 
 				$sensitive = $sensitive ?? false;
 			}
 
-			$value = (string)$input->getOption('value');
+			$value = (string) $input->getOption('value');
 			switch ($type) {
 				case IAppConfig::VALUE_MIXED:
 					$updated = $this->appConfig->setValueMixed($appName, $configName, $value, $lazy, $sensitive);
@@ -214,13 +214,13 @@ 
 		}
 
 		$output->writeln(sprintf('You are about to set config value %s as <info>%s</info>',
-			'<info>' . $input->getArgument('app') . '</info>/<info>' . $input->getArgument('name') . '</info>',
+			'<info>'.$input->getArgument('app').'</info>/<info>'.$input->getArgument('name').'</info>',
 			strtoupper($request)
 		));
 		$output->writeln('');
 		$output->writeln('<comment>This might break thing, affect performance on your instance or its security!</comment>');
 
-		$result = (strtolower((string)$helper->ask(
+		$result = (strtolower((string) $helper->ask(
 			$input,
 			$output,
 			new Question('<comment>Confirm this action by typing \'yes\'</comment>: '))) === 'yes');

core/Command/Config/ListConfigs.php

Indentation +124 added lines, -124 removed lines

@@ -18,128 +18,128 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListConfigs extends Base {
-	protected string $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
-
-	public function __construct(
-		protected SystemConfig $systemConfig,
-		protected IAppConfig $appConfig,
-		protected ConfigManager $configManager,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:list')
-			->setDescription('List all configs')
-			->addArgument(
-				'app',
-				InputArgument::OPTIONAL,
-				'Name of the app ("system" to get the config.php values, "all" for all apps and system)',
-				'all'
-			)
-			->addOption(
-				'private',
-				null,
-				InputOption::VALUE_NONE,
-				'Use this option when you want to include sensitive configs like passwords, salts, ...'
-			)
-			->addOption('migrate', null, InputOption::VALUE_NONE, 'Rename config keys of all enabled apps, based on ConfigLexicon')
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$app = $input->getArgument('app');
-		$noSensitiveValues = !$input->getOption('private');
-
-		if ($input->getOption('migrate')) {
-			$this->configManager->migrateConfigLexiconKeys(($app === 'all') ? null : $app);
-		}
-
-		if (!is_string($app)) {
-			$output->writeln('<error>Invalid app value given</error>');
-			return 1;
-		}
-
-		switch ($app) {
-			case 'system':
-				$configs = [
-					'system' => $this->getSystemConfigs($noSensitiveValues),
-				];
-				break;
-
-			case 'all':
-				$apps = $this->appConfig->getApps();
-				$configs = [
-					'system' => $this->getSystemConfigs($noSensitiveValues),
-					'apps' => [],
-				];
-				foreach ($apps as $appName) {
-					$configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
-				}
-				break;
-
-			default:
-				$configs = [
-					'apps' => [$app => $this->getAppConfigs($app, $noSensitiveValues)],
-				];
-		}
-
-		$this->writeArrayInOutputFormat($input, $output, $configs);
-		return 0;
-	}
-
-	/**
-	 * Get the system configs
-	 *
-	 * @param bool $noSensitiveValues
-	 * @return array
-	 */
-	protected function getSystemConfigs(bool $noSensitiveValues): array {
-		$keys = $this->systemConfig->getKeys();
-
-		$configs = [];
-		foreach ($keys as $key) {
-			if ($noSensitiveValues) {
-				$value = $this->systemConfig->getFilteredValue($key, serialize(null));
-			} else {
-				$value = $this->systemConfig->getValue($key, serialize(null));
-			}
-
-			if ($value !== 'N;') {
-				$configs[$key] = $value;
-			}
-		}
-
-		return $configs;
-	}
-
-	/**
-	 * Get the app configs
-	 *
-	 * @param string $app
-	 * @param bool $noSensitiveValues
-	 * @return array
-	 */
-	protected function getAppConfigs(string $app, bool $noSensitiveValues) {
-		if ($noSensitiveValues) {
-			return $this->appConfig->getFilteredValues($app, false);
-		} else {
-			return $this->appConfig->getValues($app, false);
-		}
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return array_merge(['all', 'system'], \OC_App::getAllApps());
-		}
-		return [];
-	}
+    protected string $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
+
+    public function __construct(
+        protected SystemConfig $systemConfig,
+        protected IAppConfig $appConfig,
+        protected ConfigManager $configManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:list')
+            ->setDescription('List all configs')
+            ->addArgument(
+                'app',
+                InputArgument::OPTIONAL,
+                'Name of the app ("system" to get the config.php values, "all" for all apps and system)',
+                'all'
+            )
+            ->addOption(
+                'private',
+                null,
+                InputOption::VALUE_NONE,
+                'Use this option when you want to include sensitive configs like passwords, salts, ...'
+            )
+            ->addOption('migrate', null, InputOption::VALUE_NONE, 'Rename config keys of all enabled apps, based on ConfigLexicon')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $app = $input->getArgument('app');
+        $noSensitiveValues = !$input->getOption('private');
+
+        if ($input->getOption('migrate')) {
+            $this->configManager->migrateConfigLexiconKeys(($app === 'all') ? null : $app);
+        }
+
+        if (!is_string($app)) {
+            $output->writeln('<error>Invalid app value given</error>');
+            return 1;
+        }
+
+        switch ($app) {
+            case 'system':
+                $configs = [
+                    'system' => $this->getSystemConfigs($noSensitiveValues),
+                ];
+                break;
+
+            case 'all':
+                $apps = $this->appConfig->getApps();
+                $configs = [
+                    'system' => $this->getSystemConfigs($noSensitiveValues),
+                    'apps' => [],
+                ];
+                foreach ($apps as $appName) {
+                    $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
+                }
+                break;
+
+            default:
+                $configs = [
+                    'apps' => [$app => $this->getAppConfigs($app, $noSensitiveValues)],
+                ];
+        }
+
+        $this->writeArrayInOutputFormat($input, $output, $configs);
+        return 0;
+    }
+
+    /**
+     * Get the system configs
+     *
+     * @param bool $noSensitiveValues
+     * @return array
+     */
+    protected function getSystemConfigs(bool $noSensitiveValues): array {
+        $keys = $this->systemConfig->getKeys();
+
+        $configs = [];
+        foreach ($keys as $key) {
+            if ($noSensitiveValues) {
+                $value = $this->systemConfig->getFilteredValue($key, serialize(null));
+            } else {
+                $value = $this->systemConfig->getValue($key, serialize(null));
+            }
+
+            if ($value !== 'N;') {
+                $configs[$key] = $value;
+            }
+        }
+
+        return $configs;
+    }
+
+    /**
+     * Get the app configs
+     *
+     * @param string $app
+     * @param bool $noSensitiveValues
+     * @return array
+     */
+    protected function getAppConfigs(string $app, bool $noSensitiveValues) {
+        if ($noSensitiveValues) {
+            return $this->appConfig->getFilteredValues($app, false);
+        } else {
+            return $this->appConfig->getValues($app, false);
+        }
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return array_merge(['all', 'system'], \OC_App::getAllApps());
+        }
+        return [];
+    }
 }

tests/lib/Config/TestConfigLexicon_I.php

Indentation +21 added lines, -21 removed lines

@@ -16,26 +16,26 @@
 use OCP\IAppConfig;
 
 class TestConfigLexicon_I implements IConfigLexicon {
-	public const APPID = 'lexicon_test_i';
-
-	public function getStrictness(): ConfigLexiconStrictness {
-		return ConfigLexiconStrictness::IGNORE;
-	}
-
-	public function getAppConfigs(): array {
-		return [
-			new ConfigLexiconEntry('key1', ValueType::STRING, 'abcde', 'test key', true, IAppConfig::FLAG_SENSITIVE),
-			new ConfigLexiconEntry('key2', ValueType::INT, 12345, 'test key', false),
-			new ConfigLexiconEntry('key3', ValueType::INT, 12345, 'test key', true, rename: 'old_key3'),
-			new ConfigLexiconEntry('key4', ValueType::BOOL, 12345, 'test key', true, rename: 'old_key4', options: ConfigLexiconEntry::RENAME_INVERT_BOOLEAN),
-		];
-	}
-
-	public function getUserConfigs(): array {
-		return [
-			new ConfigLexiconEntry('key1', ValueType::STRING, 'abcde', 'test key', true, IUserConfig::FLAG_SENSITIVE),
-			new ConfigLexiconEntry('key2', ValueType::INT, 12345, 'test key', false)
-		];
-	}
+    public const APPID = 'lexicon_test_i';
+
+    public function getStrictness(): ConfigLexiconStrictness {
+        return ConfigLexiconStrictness::IGNORE;
+    }
+
+    public function getAppConfigs(): array {
+        return [
+            new ConfigLexiconEntry('key1', ValueType::STRING, 'abcde', 'test key', true, IAppConfig::FLAG_SENSITIVE),
+            new ConfigLexiconEntry('key2', ValueType::INT, 12345, 'test key', false),
+            new ConfigLexiconEntry('key3', ValueType::INT, 12345, 'test key', true, rename: 'old_key3'),
+            new ConfigLexiconEntry('key4', ValueType::BOOL, 12345, 'test key', true, rename: 'old_key4', options: ConfigLexiconEntry::RENAME_INVERT_BOOLEAN),
+        ];
+    }
+
+    public function getUserConfigs(): array {
+        return [
+            new ConfigLexiconEntry('key1', ValueType::STRING, 'abcde', 'test key', true, IUserConfig::FLAG_SENSITIVE),
+            new ConfigLexiconEntry('key2', ValueType::INT, 12345, 'test key', false)
+        ];
+    }
 
 }

tests/lib/Config/LexiconTest.php

Indentation +176 added lines, -176 removed lines

@@ -27,180 +27,180 @@
  * @package Test
  */
 class LexiconTest extends TestCase {
-	/** @var AppConfig */
-	private IAppConfig $appConfig;
-	private IUserConfig $userConfig;
-	private ConfigManager $configManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$bootstrapCoordinator = Server::get(Coordinator::class);
-		$bootstrapCoordinator->getRegistrationContext()?->registerConfigLexicon(TestConfigLexicon_I::APPID, TestConfigLexicon_I::class);
-		$bootstrapCoordinator->getRegistrationContext()?->registerConfigLexicon(TestConfigLexicon_N::APPID, TestConfigLexicon_N::class);
-		$bootstrapCoordinator->getRegistrationContext()?->registerConfigLexicon(TestConfigLexicon_W::APPID, TestConfigLexicon_W::class);
-		$bootstrapCoordinator->getRegistrationContext()?->registerConfigLexicon(TestConfigLexicon_E::APPID, TestConfigLexicon_E::class);
-
-		$this->appConfig = Server::get(IAppConfig::class);
-		$this->userConfig = Server::get(IUserConfig::class);
-		$this->configManager = Server::get(ConfigManager::class);
-	}
-
-	protected function tearDown(): void {
-		parent::tearDown();
-
-		$this->appConfig->deleteApp(TestConfigLexicon_I::APPID);
-		$this->appConfig->deleteApp(TestConfigLexicon_N::APPID);
-		$this->appConfig->deleteApp(TestConfigLexicon_W::APPID);
-		$this->appConfig->deleteApp(TestConfigLexicon_E::APPID);
-
-		$this->userConfig->deleteApp(TestConfigLexicon_I::APPID);
-		$this->userConfig->deleteApp(TestConfigLexicon_N::APPID);
-		$this->userConfig->deleteApp(TestConfigLexicon_W::APPID);
-		$this->userConfig->deleteApp(TestConfigLexicon_E::APPID);
-	}
-
-	public function testAppLexiconSetCorrect() {
-		$this->assertSame(true, $this->appConfig->setValueString(TestConfigLexicon_E::APPID, 'key1', 'new_value'));
-		$this->assertSame(true, $this->appConfig->isLazy(TestConfigLexicon_E::APPID, 'key1'));
-		$this->assertSame(true, $this->appConfig->isSensitive(TestConfigLexicon_E::APPID, 'key1'));
-		$this->appConfig->deleteKey(TestConfigLexicon_E::APPID, 'key1');
-	}
-
-	public function testAppLexiconGetCorrect() {
-		$this->assertSame('abcde', $this->appConfig->getValueString(TestConfigLexicon_E::APPID, 'key1', 'default'));
-	}
-
-	public function testAppLexiconSetIncorrectValueType() {
-		$this->expectException(AppConfigTypeConflictException::class);
-		$this->appConfig->setValueInt(TestConfigLexicon_E::APPID, 'key1', -1);
-	}
-
-	public function testAppLexiconGetIncorrectValueType() {
-		$this->expectException(AppConfigTypeConflictException::class);
-		$this->appConfig->getValueInt(TestConfigLexicon_E::APPID, 'key1');
-	}
-
-	public function testAppLexiconIgnore() {
-		$this->appConfig->setValueString(TestConfigLexicon_I::APPID, 'key_ignore', 'new_value');
-		$this->assertSame('new_value', $this->appConfig->getValueString(TestConfigLexicon_I::APPID, 'key_ignore', ''));
-	}
-
-	public function testAppLexiconNotice() {
-		$this->appConfig->setValueString(TestConfigLexicon_N::APPID, 'key_notice', 'new_value');
-		$this->assertSame('new_value', $this->appConfig->getValueString(TestConfigLexicon_N::APPID, 'key_notice', ''));
-	}
-
-	public function testAppLexiconWarning() {
-		$this->appConfig->setValueString(TestConfigLexicon_W::APPID, 'key_warning', 'new_value');
-		$this->assertSame('', $this->appConfig->getValueString(TestConfigLexicon_W::APPID, 'key_warning', ''));
-	}
-
-	public function testAppLexiconSetException() {
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$this->appConfig->setValueString(TestConfigLexicon_E::APPID, 'key_exception', 'new_value');
-		$this->assertSame('', $this->appConfig->getValueString(TestConfigLexicon_E::APPID, 'key3', ''));
-	}
-
-	public function testAppLexiconGetException() {
-		$this->expectException(AppConfigUnknownKeyException::class);
-		$this->appConfig->getValueString(TestConfigLexicon_E::APPID, 'key_exception');
-	}
-
-	public function testUserLexiconSetCorrect() {
-		$this->assertSame(true, $this->userConfig->setValueString('user1', TestConfigLexicon_E::APPID, 'key1', 'new_value'));
-		$this->assertSame(true, $this->userConfig->isLazy('user1', TestConfigLexicon_E::APPID, 'key1'));
-		$this->assertSame(true, $this->userConfig->isSensitive('user1', TestConfigLexicon_E::APPID, 'key1'));
-		$this->userConfig->deleteKey(TestConfigLexicon_E::APPID, 'key1');
-	}
-
-	public function testUserLexiconGetCorrect() {
-		$this->assertSame('abcde', $this->userConfig->getValueString('user1', TestConfigLexicon_E::APPID, 'key1', 'default'));
-	}
-
-	public function testUserLexiconSetIncorrectValueType() {
-		$this->expectException(TypeConflictException::class);
-		$this->userConfig->setValueInt('user1', TestConfigLexicon_E::APPID, 'key1', -1);
-	}
-
-	public function testUserLexiconGetIncorrectValueType() {
-		$this->expectException(TypeConflictException::class);
-		$this->userConfig->getValueInt('user1', TestConfigLexicon_E::APPID, 'key1');
-	}
-
-	public function testUserLexiconIgnore() {
-		$this->userConfig->setValueString('user1', TestConfigLexicon_I::APPID, 'key_ignore', 'new_value');
-		$this->assertSame('new_value', $this->userConfig->getValueString('user1', TestConfigLexicon_I::APPID, 'key_ignore', ''));
-	}
-
-	public function testUserLexiconNotice() {
-		$this->userConfig->setValueString('user1', TestConfigLexicon_N::APPID, 'key_notice', 'new_value');
-		$this->assertSame('new_value', $this->userConfig->getValueString('user1', TestConfigLexicon_N::APPID, 'key_notice', ''));
-	}
-
-	public function testUserLexiconWarning() {
-		$this->userConfig->setValueString('user1', TestConfigLexicon_W::APPID, 'key_warning', 'new_value');
-		$this->assertSame('', $this->userConfig->getValueString('user1', TestConfigLexicon_W::APPID, 'key_warning', ''));
-	}
-
-	public function testUserLexiconSetException() {
-		$this->expectException(UnknownKeyException::class);
-		$this->userConfig->setValueString('user1', TestConfigLexicon_E::APPID, 'key_exception', 'new_value');
-		$this->assertSame('', $this->userConfig->getValueString('user1', TestConfigLexicon_E::APPID, 'key5', ''));
-	}
-
-	public function testUserLexiconGetException() {
-		$this->expectException(UnknownKeyException::class);
-		$this->userConfig->getValueString('user1', TestConfigLexicon_E::APPID, 'key_exception');
-	}
-
-	public function testAppConfigLexiconRenameSetNewValue() {
-		$this->assertSame(12345, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'key3', 123));
-		$this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'old_key3', 994);
-		$this->assertSame(994, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'key3', 123));
-	}
-
-	public function testAppConfigLexiconRenameSetOldValuePreMigration() {
-		$this->appConfig->ignoreLexiconAliases(true);
-		$this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'old_key3', 993);
-		$this->appConfig->ignoreLexiconAliases(false);
-		$this->assertSame(12345, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'key3', 123));
-	}
-
-	public function testAppConfigLexiconRenameSetOldValuePostMigration() {
-		$this->appConfig->ignoreLexiconAliases(true);
-		$this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'old_key3', 994);
-		$this->appConfig->ignoreLexiconAliases(false);
-		$this->configManager->migrateConfigLexiconKeys(TestConfigLexicon_I::APPID);
-		$this->assertSame(994, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'key3', 123));
-	}
-
-	public function testAppConfigLexiconRenameGetNewValue() {
-		$this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'key3', 981);
-		$this->assertSame(981, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'old_key3', 123));
-	}
-
-	public function testAppConfigLexiconRenameGetOldValuePreMigration() {
-		$this->appConfig->ignoreLexiconAliases(true);
-		$this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'key3', 984);
-		$this->assertSame(123, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'old_key3', 123));
-		$this->appConfig->ignoreLexiconAliases(false);
-	}
-
-	public function testAppConfigLexiconRenameGetOldValuePostMigration() {
-		$this->appConfig->ignoreLexiconAliases(true);
-		$this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'key3', 987);
-		$this->appConfig->ignoreLexiconAliases(false);
-		$this->configManager->migrateConfigLexiconKeys(TestConfigLexicon_I::APPID);
-		$this->assertSame(987, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'old_key3', 123));
-	}
-
-	public function testAppConfigLexiconRenameInvertBoolean() {
-		$this->appConfig->ignoreLexiconAliases(true);
-		$this->appConfig->setValueBool(TestConfigLexicon_I::APPID, 'old_key4', true);
-		$this->appConfig->ignoreLexiconAliases(false);
-		$this->assertSame(true, $this->appConfig->getValueBool(TestConfigLexicon_I::APPID, 'key4'));
-		$this->configManager->migrateConfigLexiconKeys(TestConfigLexicon_I::APPID);
-		$this->assertSame(false, $this->appConfig->getValueBool(TestConfigLexicon_I::APPID, 'key4'));
-	}
+    /** @var AppConfig */
+    private IAppConfig $appConfig;
+    private IUserConfig $userConfig;
+    private ConfigManager $configManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $bootstrapCoordinator = Server::get(Coordinator::class);
+        $bootstrapCoordinator->getRegistrationContext()?->registerConfigLexicon(TestConfigLexicon_I::APPID, TestConfigLexicon_I::class);
+        $bootstrapCoordinator->getRegistrationContext()?->registerConfigLexicon(TestConfigLexicon_N::APPID, TestConfigLexicon_N::class);
+        $bootstrapCoordinator->getRegistrationContext()?->registerConfigLexicon(TestConfigLexicon_W::APPID, TestConfigLexicon_W::class);
+        $bootstrapCoordinator->getRegistrationContext()?->registerConfigLexicon(TestConfigLexicon_E::APPID, TestConfigLexicon_E::class);
+
+        $this->appConfig = Server::get(IAppConfig::class);
+        $this->userConfig = Server::get(IUserConfig::class);
+        $this->configManager = Server::get(ConfigManager::class);
+    }
+
+    protected function tearDown(): void {
+        parent::tearDown();
+
+        $this->appConfig->deleteApp(TestConfigLexicon_I::APPID);
+        $this->appConfig->deleteApp(TestConfigLexicon_N::APPID);
+        $this->appConfig->deleteApp(TestConfigLexicon_W::APPID);
+        $this->appConfig->deleteApp(TestConfigLexicon_E::APPID);
+
+        $this->userConfig->deleteApp(TestConfigLexicon_I::APPID);
+        $this->userConfig->deleteApp(TestConfigLexicon_N::APPID);
+        $this->userConfig->deleteApp(TestConfigLexicon_W::APPID);
+        $this->userConfig->deleteApp(TestConfigLexicon_E::APPID);
+    }
+
+    public function testAppLexiconSetCorrect() {
+        $this->assertSame(true, $this->appConfig->setValueString(TestConfigLexicon_E::APPID, 'key1', 'new_value'));
+        $this->assertSame(true, $this->appConfig->isLazy(TestConfigLexicon_E::APPID, 'key1'));
+        $this->assertSame(true, $this->appConfig->isSensitive(TestConfigLexicon_E::APPID, 'key1'));
+        $this->appConfig->deleteKey(TestConfigLexicon_E::APPID, 'key1');
+    }
+
+    public function testAppLexiconGetCorrect() {
+        $this->assertSame('abcde', $this->appConfig->getValueString(TestConfigLexicon_E::APPID, 'key1', 'default'));
+    }
+
+    public function testAppLexiconSetIncorrectValueType() {
+        $this->expectException(AppConfigTypeConflictException::class);
+        $this->appConfig->setValueInt(TestConfigLexicon_E::APPID, 'key1', -1);
+    }
+
+    public function testAppLexiconGetIncorrectValueType() {
+        $this->expectException(AppConfigTypeConflictException::class);
+        $this->appConfig->getValueInt(TestConfigLexicon_E::APPID, 'key1');
+    }
+
+    public function testAppLexiconIgnore() {
+        $this->appConfig->setValueString(TestConfigLexicon_I::APPID, 'key_ignore', 'new_value');
+        $this->assertSame('new_value', $this->appConfig->getValueString(TestConfigLexicon_I::APPID, 'key_ignore', ''));
+    }
+
+    public function testAppLexiconNotice() {
+        $this->appConfig->setValueString(TestConfigLexicon_N::APPID, 'key_notice', 'new_value');
+        $this->assertSame('new_value', $this->appConfig->getValueString(TestConfigLexicon_N::APPID, 'key_notice', ''));
+    }
+
+    public function testAppLexiconWarning() {
+        $this->appConfig->setValueString(TestConfigLexicon_W::APPID, 'key_warning', 'new_value');
+        $this->assertSame('', $this->appConfig->getValueString(TestConfigLexicon_W::APPID, 'key_warning', ''));
+    }
+
+    public function testAppLexiconSetException() {
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $this->appConfig->setValueString(TestConfigLexicon_E::APPID, 'key_exception', 'new_value');
+        $this->assertSame('', $this->appConfig->getValueString(TestConfigLexicon_E::APPID, 'key3', ''));
+    }
+
+    public function testAppLexiconGetException() {
+        $this->expectException(AppConfigUnknownKeyException::class);
+        $this->appConfig->getValueString(TestConfigLexicon_E::APPID, 'key_exception');
+    }
+
+    public function testUserLexiconSetCorrect() {
+        $this->assertSame(true, $this->userConfig->setValueString('user1', TestConfigLexicon_E::APPID, 'key1', 'new_value'));
+        $this->assertSame(true, $this->userConfig->isLazy('user1', TestConfigLexicon_E::APPID, 'key1'));
+        $this->assertSame(true, $this->userConfig->isSensitive('user1', TestConfigLexicon_E::APPID, 'key1'));
+        $this->userConfig->deleteKey(TestConfigLexicon_E::APPID, 'key1');
+    }
+
+    public function testUserLexiconGetCorrect() {
+        $this->assertSame('abcde', $this->userConfig->getValueString('user1', TestConfigLexicon_E::APPID, 'key1', 'default'));
+    }
+
+    public function testUserLexiconSetIncorrectValueType() {
+        $this->expectException(TypeConflictException::class);
+        $this->userConfig->setValueInt('user1', TestConfigLexicon_E::APPID, 'key1', -1);
+    }
+
+    public function testUserLexiconGetIncorrectValueType() {
+        $this->expectException(TypeConflictException::class);
+        $this->userConfig->getValueInt('user1', TestConfigLexicon_E::APPID, 'key1');
+    }
+
+    public function testUserLexiconIgnore() {
+        $this->userConfig->setValueString('user1', TestConfigLexicon_I::APPID, 'key_ignore', 'new_value');
+        $this->assertSame('new_value', $this->userConfig->getValueString('user1', TestConfigLexicon_I::APPID, 'key_ignore', ''));
+    }
+
+    public function testUserLexiconNotice() {
+        $this->userConfig->setValueString('user1', TestConfigLexicon_N::APPID, 'key_notice', 'new_value');
+        $this->assertSame('new_value', $this->userConfig->getValueString('user1', TestConfigLexicon_N::APPID, 'key_notice', ''));
+    }
+
+    public function testUserLexiconWarning() {
+        $this->userConfig->setValueString('user1', TestConfigLexicon_W::APPID, 'key_warning', 'new_value');
+        $this->assertSame('', $this->userConfig->getValueString('user1', TestConfigLexicon_W::APPID, 'key_warning', ''));
+    }
+
+    public function testUserLexiconSetException() {
+        $this->expectException(UnknownKeyException::class);
+        $this->userConfig->setValueString('user1', TestConfigLexicon_E::APPID, 'key_exception', 'new_value');
+        $this->assertSame('', $this->userConfig->getValueString('user1', TestConfigLexicon_E::APPID, 'key5', ''));
+    }
+
+    public function testUserLexiconGetException() {
+        $this->expectException(UnknownKeyException::class);
+        $this->userConfig->getValueString('user1', TestConfigLexicon_E::APPID, 'key_exception');
+    }
+
+    public function testAppConfigLexiconRenameSetNewValue() {
+        $this->assertSame(12345, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'key3', 123));
+        $this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'old_key3', 994);
+        $this->assertSame(994, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'key3', 123));
+    }
+
+    public function testAppConfigLexiconRenameSetOldValuePreMigration() {
+        $this->appConfig->ignoreLexiconAliases(true);
+        $this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'old_key3', 993);
+        $this->appConfig->ignoreLexiconAliases(false);
+        $this->assertSame(12345, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'key3', 123));
+    }
+
+    public function testAppConfigLexiconRenameSetOldValuePostMigration() {
+        $this->appConfig->ignoreLexiconAliases(true);
+        $this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'old_key3', 994);
+        $this->appConfig->ignoreLexiconAliases(false);
+        $this->configManager->migrateConfigLexiconKeys(TestConfigLexicon_I::APPID);
+        $this->assertSame(994, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'key3', 123));
+    }
+
+    public function testAppConfigLexiconRenameGetNewValue() {
+        $this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'key3', 981);
+        $this->assertSame(981, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'old_key3', 123));
+    }
+
+    public function testAppConfigLexiconRenameGetOldValuePreMigration() {
+        $this->appConfig->ignoreLexiconAliases(true);
+        $this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'key3', 984);
+        $this->assertSame(123, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'old_key3', 123));
+        $this->appConfig->ignoreLexiconAliases(false);
+    }
+
+    public function testAppConfigLexiconRenameGetOldValuePostMigration() {
+        $this->appConfig->ignoreLexiconAliases(true);
+        $this->appConfig->setValueInt(TestConfigLexicon_I::APPID, 'key3', 987);
+        $this->appConfig->ignoreLexiconAliases(false);
+        $this->configManager->migrateConfigLexiconKeys(TestConfigLexicon_I::APPID);
+        $this->assertSame(987, $this->appConfig->getValueInt(TestConfigLexicon_I::APPID, 'old_key3', 123));
+    }
+
+    public function testAppConfigLexiconRenameInvertBoolean() {
+        $this->appConfig->ignoreLexiconAliases(true);
+        $this->appConfig->setValueBool(TestConfigLexicon_I::APPID, 'old_key4', true);
+        $this->appConfig->ignoreLexiconAliases(false);
+        $this->assertSame(true, $this->appConfig->getValueBool(TestConfigLexicon_I::APPID, 'key4'));
+        $this->configManager->migrateConfigLexiconKeys(TestConfigLexicon_I::APPID);
+        $this->assertSame(false, $this->appConfig->getValueBool(TestConfigLexicon_I::APPID, 'key4'));
+    }
 }

tests/lib/AppTest.php

Indentation +613 added lines, -613 removed lines

@@ -30,617 +30,617 @@
  * @group DB
  */
 class AppTest extends \Test\TestCase {
-	public const TEST_USER1 = 'user1';
-	public const TEST_USER2 = 'user2';
-	public const TEST_USER3 = 'user3';
-	public const TEST_GROUP1 = 'group1';
-	public const TEST_GROUP2 = 'group2';
-
-	public static function appVersionsProvider(): array {
-		return [
-			// exact match
-			[
-				'6.0.0.0',
-				[
-					'requiremin' => '6.0',
-					'requiremax' => '6.0',
-				],
-				true
-			],
-			// in-between match
-			[
-				'6.0.0.0',
-				[
-					'requiremin' => '5.0',
-					'requiremax' => '7.0',
-				],
-				true
-			],
-			// app too old
-			[
-				'6.0.0.0',
-				[
-					'requiremin' => '5.0',
-					'requiremax' => '5.0',
-				],
-				false
-			],
-			// app too new
-			[
-				'5.0.0.0',
-				[
-					'requiremin' => '6.0',
-					'requiremax' => '6.0',
-				],
-				false
-			],
-			// only min specified
-			[
-				'6.0.0.0',
-				[
-					'requiremin' => '6.0',
-				],
-				true
-			],
-			// only min specified fail
-			[
-				'5.0.0.0',
-				[
-					'requiremin' => '6.0',
-				],
-				false
-			],
-			// only min specified legacy
-			[
-				'6.0.0.0',
-				[
-					'require' => '6.0',
-				],
-				true
-			],
-			// only min specified legacy fail
-			[
-				'4.0.0.0',
-				[
-					'require' => '6.0',
-				],
-				false
-			],
-			// only max specified
-			[
-				'5.0.0.0',
-				[
-					'requiremax' => '6.0',
-				],
-				true
-			],
-			// only max specified fail
-			[
-				'7.0.0.0',
-				[
-					'requiremax' => '6.0',
-				],
-				false
-			],
-			// variations of versions
-			// single OC number
-			[
-				'4',
-				[
-					'require' => '4.0',
-				],
-				true
-			],
-			// multiple OC number
-			[
-				'4.3.1',
-				[
-					'require' => '4.3',
-				],
-				true
-			],
-			// single app number
-			[
-				'4',
-				[
-					'require' => '4',
-				],
-				true
-			],
-			// single app number fail
-			[
-				'4.3',
-				[
-					'require' => '5',
-				],
-				false
-			],
-			// complex
-			[
-				'5.0.0',
-				[
-					'require' => '4.5.1',
-				],
-				true
-			],
-			// complex fail
-			[
-				'4.3.1',
-				[
-					'require' => '4.3.2',
-				],
-				false
-			],
-			// two numbers
-			[
-				'4.3.1',
-				[
-					'require' => '4.4',
-				],
-				false
-			],
-			// one number fail
-			[
-				'4.3.1',
-				[
-					'require' => '5',
-				],
-				false
-			],
-			// pre-alpha app
-			[
-				'5.0.3',
-				[
-					'require' => '4.93',
-				],
-				true
-			],
-			// pre-alpha OC
-			[
-				'6.90.0.2',
-				[
-					'require' => '6.90',
-				],
-				true
-			],
-			// pre-alpha OC max
-			[
-				'6.90.0.2',
-				[
-					'requiremax' => '7',
-				],
-				true
-			],
-			// expect same major number match
-			[
-				'5.0.3',
-				[
-					'require' => '5',
-				],
-				true
-			],
-			// expect same major number match
-			[
-				'5.0.3',
-				[
-					'requiremax' => '5',
-				],
-				true
-			],
-			// dependencies versions before require*
-			[
-				'6.0.0.0',
-				[
-					'requiremin' => '5.0',
-					'requiremax' => '7.0',
-					'dependencies' => [
-						'owncloud' => [
-							'@attributes' => [
-								'min-version' => '7.0',
-								'max-version' => '7.0',
-							],
-						],
-					],
-				],
-				false
-			],
-			[
-				'6.0.0.0',
-				[
-					'requiremin' => '5.0',
-					'requiremax' => '7.0',
-					'dependencies' => [
-						'owncloud' => [
-							'@attributes' => [
-								'min-version' => '5.0',
-								'max-version' => '5.0',
-							],
-						],
-					],
-				],
-				false
-			],
-			[
-				'6.0.0.0',
-				[
-					'requiremin' => '5.0',
-					'requiremax' => '5.0',
-					'dependencies' => [
-						'owncloud' => [
-							'@attributes' => [
-								'min-version' => '5.0',
-								'max-version' => '7.0',
-							],
-						],
-					],
-				],
-				true
-			],
-			[
-				'9.2.0.0',
-				[
-					'dependencies' => [
-						'owncloud' => [
-							'@attributes' => [
-								'min-version' => '9.0',
-								'max-version' => '9.1',
-							],
-						],
-						'nextcloud' => [
-							'@attributes' => [
-								'min-version' => '9.1',
-								'max-version' => '9.2',
-							],
-						],
-					],
-				],
-				true
-			],
-			[
-				'9.2.0.0',
-				[
-					'dependencies' => [
-						'nextcloud' => [
-							'@attributes' => [
-								'min-version' => '9.1',
-								'max-version' => '9.2',
-							],
-						],
-					],
-				],
-				true
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider appVersionsProvider
-	 */
-	public function testIsAppCompatible($ocVersion, $appInfo, $expectedResult): void {
-		$this->assertEquals($expectedResult, \OC_App::isAppCompatible($ocVersion, $appInfo));
-	}
-
-	/**
-	 * Tests that the app order is correct
-	 */
-	public function testGetEnabledAppsIsSorted(): void {
-		$apps = \OC_App::getEnabledApps();
-		// copy array
-		$sortedApps = $apps;
-		sort($sortedApps);
-		// 'files' is always on top
-		unset($sortedApps[array_search('files', $sortedApps)]);
-		array_unshift($sortedApps, 'files');
-		$this->assertEquals($sortedApps, $apps);
-	}
-
-	/**
-	 * Providers for the app config values
-	 */
-	public static function appConfigValuesProvider(): array {
-		return [
-			// logged in user1
-			[
-				self::TEST_USER1,
-				[
-					'files',
-					'app1',
-					'app3',
-					'appforgroup1',
-					'appforgroup12',
-					'cloud_federation_api',
-					'dav',
-					'federatedfilesharing',
-					'lookup_server_connector',
-					'oauth2',
-					'profile',
-					'provisioning_api',
-					'settings',
-					'theming',
-					'twofactor_backupcodes',
-					'viewer',
-					'workflowengine',
-				],
-				false
-			],
-			// logged in user2
-			[
-				self::TEST_USER2,
-				[
-					'files',
-					'app1',
-					'app3',
-					'appforgroup12',
-					'appforgroup2',
-					'cloud_federation_api',
-					'dav',
-					'federatedfilesharing',
-					'lookup_server_connector',
-					'oauth2',
-					'profile',
-					'provisioning_api',
-					'settings',
-					'theming',
-					'twofactor_backupcodes',
-					'viewer',
-					'workflowengine',
-				],
-				false
-			],
-			// logged in user3
-			[
-				self::TEST_USER3,
-				[
-					'files',
-					'app1',
-					'app3',
-					'appforgroup1',
-					'appforgroup12',
-					'appforgroup2',
-					'cloud_federation_api',
-					'dav',
-					'federatedfilesharing',
-					'lookup_server_connector',
-					'oauth2',
-					'profile',
-					'provisioning_api',
-					'settings',
-					'theming',
-					'twofactor_backupcodes',
-					'viewer',
-					'workflowengine',
-				],
-				false
-			],
-			//  no user, returns all apps
-			[
-				null,
-				[
-					'files',
-					'app1',
-					'app3',
-					'appforgroup1',
-					'appforgroup12',
-					'appforgroup2',
-					'cloud_federation_api',
-					'dav',
-					'federatedfilesharing',
-					'lookup_server_connector',
-					'oauth2',
-					'profile',
-					'provisioning_api',
-					'settings',
-					'theming',
-					'twofactor_backupcodes',
-					'viewer',
-					'workflowengine',
-				],
-				false,
-			],
-			//  user given, but ask for all
-			[
-				self::TEST_USER1,
-				[
-					'files',
-					'app1',
-					'app3',
-					'appforgroup1',
-					'appforgroup12',
-					'appforgroup2',
-					'cloud_federation_api',
-					'dav',
-					'federatedfilesharing',
-					'lookup_server_connector',
-					'oauth2',
-					'profile',
-					'provisioning_api',
-					'settings',
-					'theming',
-					'twofactor_backupcodes',
-					'viewer',
-					'workflowengine',
-				],
-				true,
-			],
-		];
-	}
-
-	/**
-	 * Test enabled apps
-	 *
-	 * @dataProvider appConfigValuesProvider
-	 */
-	public function testEnabledApps($user, $expectedApps, $forceAll): void {
-		$userManager = Server::get(IUserManager::class);
-		$groupManager = Server::get(IGroupManager::class);
-		$user1 = $userManager->createUser(self::TEST_USER1, 'NotAnEasyPassword123456+');
-		$user2 = $userManager->createUser(self::TEST_USER2, 'NotAnEasyPassword123456_');
-		$user3 = $userManager->createUser(self::TEST_USER3, 'NotAnEasyPassword123456?');
-
-		$group1 = $groupManager->createGroup(self::TEST_GROUP1);
-		$group1->addUser($user1);
-		$group1->addUser($user3);
-		$group2 = $groupManager->createGroup(self::TEST_GROUP2);
-		$group2->addUser($user2);
-		$group2->addUser($user3);
-
-		\OC_User::setUserId($user);
-
-		$this->setupAppConfigMock()->expects($this->once())
-			->method('searchValues')
-			->willReturn(
-				[
-					'app3' => 'yes',
-					'app2' => 'no',
-					'app1' => 'yes',
-					'appforgroup1' => '["group1"]',
-					'appforgroup2' => '["group2"]',
-					'appforgroup12' => '["group2","group1"]',
-				]
-			);
-
-		$apps = \OC_App::getEnabledApps(false, $forceAll);
-
-		$this->restoreAppConfig();
-		\OC_User::setUserId(null);
-
-		$user1->delete();
-		$user2->delete();
-		$user3->delete();
-
-		$group1->delete();
-		$group2->delete();
-
-		$this->assertEquals($expectedApps, $apps);
-	}
-
-	/**
-	 * Test isEnabledApps() with cache, not re-reading the list of
-	 * enabled apps more than once when a user is set.
-	 */
-	public function testEnabledAppsCache(): void {
-		$userManager = Server::get(IUserManager::class);
-		$user1 = $userManager->createUser(self::TEST_USER1, 'NotAnEasyPassword123456+');
-
-		\OC_User::setUserId(self::TEST_USER1);
-
-		$this->setupAppConfigMock()->expects($this->once())
-			->method('searchValues')
-			->willReturn(
-				[
-					'app3' => 'yes',
-					'app2' => 'no',
-				]
-			);
-
-		$apps = \OC_App::getEnabledApps();
-		$this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'profile', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps);
-
-		// mock should not be called again here
-		$apps = \OC_App::getEnabledApps();
-		$this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'profile', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps);
-
-		$this->restoreAppConfig();
-		\OC_User::setUserId(null);
-
-		$user1->delete();
-	}
-
-
-	private function setupAppConfigMock() {
-		/** @var AppConfig|MockObject */
-		$appConfig = $this->getMockBuilder(AppConfig::class)
-			->onlyMethods(['searchValues'])
-			->setConstructorArgs([Server::get(IDBConnection::class)])
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->registerAppConfig($appConfig);
-		return $appConfig;
-	}
-
-	/**
-	 * Register an app config mock for testing purposes.
-	 *
-	 * @param IAppConfig $appConfig app config mock
-	 */
-	private function registerAppConfig(AppConfig $appConfig) {
-		$this->overwriteService(AppConfig::class, $appConfig);
-		$this->overwriteService(AppManager::class, new AppManager(
-			Server::get(IUserSession::class),
-			Server::get(IConfig::class),
-			Server::get(IGroupManager::class),
-			Server::get(ICacheFactory::class),
-			Server::get(IEventDispatcher::class),
-			Server::get(LoggerInterface::class),
-			Server::get(ServerVersion::class),
-			\OCP\Server::get(ConfigManager::class),
-		));
-	}
-
-	/**
-	 * Restore the original app config service.
-	 */
-	private function restoreAppConfig() {
-		$this->restoreService(AppConfig::class);
-		$this->restoreService(AppManager::class);
-
-		// Remove the cache of the mocked apps list with a forceRefresh
-		\OC_App::getEnabledApps();
-	}
-
-	/**
-	 * Providers for the app data values
-	 */
-	public static function appDataProvider(): array {
-		return [
-			[
-				['description' => " \t  This is a multiline \n test with \n \t \n \n some new lines   "],
-				['description' => "This is a multiline \n test with \n \t \n \n some new lines"],
-			],
-			[
-				['description' => " \t  This is a multiline \n test with \n \t   some new lines   "],
-				['description' => "This is a multiline \n test with \n \t   some new lines"],
-			],
-			[
-				['description' => hex2bin('5065726d657420646520732761757468656e7469666965722064616e732070697769676f20646972656374656d656e74206176656320736573206964656e74696669616e7473206f776e636c6f75642073616e73206c65732072657461706572206574206d657420c3a0206a6f757273206365757820636920656e20636173206465206368616e67656d656e74206465206d6f742064652070617373652e0d0a0d')],
-				['description' => "Permet de s'authentifier dans piwigo directement avec ses identifiants owncloud sans les retaper et met à jours ceux ci en cas de changement de mot de passe."],
-			],
-			[
-				['not-a-description' => " \t  This is a multiline \n test with \n \t   some new lines   "],
-				[
-					'not-a-description' => " \t  This is a multiline \n test with \n \t   some new lines   ",
-					'description' => '',
-				],
-			],
-			[
-				['description' => [100, 'bla']],
-				['description' => ''],
-			],
-		];
-	}
-
-	/**
-	 * Test app info parser
-	 *
-	 * @dataProvider appDataProvider
-	 * @param array $data
-	 * @param array $expected
-	 */
-	public function testParseAppInfo(array $data, array $expected): void {
-		$this->assertSame($expected, \OC_App::parseAppInfo($data));
-	}
-
-	public function testParseAppInfoL10N(): void {
-		$parser = new InfoParser();
-		$data = $parser->parse(\OC::$SERVERROOT . '/tests/data/app/description-multi-lang.xml');
-		$this->assertEquals('English', \OC_App::parseAppInfo($data, 'en')['description']);
-		$this->assertEquals('German', \OC_App::parseAppInfo($data, 'de')['description']);
-	}
-
-	public function testParseAppInfoL10NSingleLanguage(): void {
-		$parser = new InfoParser();
-		$data = $parser->parse(\OC::$SERVERROOT . '/tests/data/app/description-single-lang.xml');
-		$this->assertEquals('English', \OC_App::parseAppInfo($data, 'en')['description']);
-	}
+    public const TEST_USER1 = 'user1';
+    public const TEST_USER2 = 'user2';
+    public const TEST_USER3 = 'user3';
+    public const TEST_GROUP1 = 'group1';
+    public const TEST_GROUP2 = 'group2';
+
+    public static function appVersionsProvider(): array {
+        return [
+            // exact match
+            [
+                '6.0.0.0',
+                [
+                    'requiremin' => '6.0',
+                    'requiremax' => '6.0',
+                ],
+                true
+            ],
+            // in-between match
+            [
+                '6.0.0.0',
+                [
+                    'requiremin' => '5.0',
+                    'requiremax' => '7.0',
+                ],
+                true
+            ],
+            // app too old
+            [
+                '6.0.0.0',
+                [
+                    'requiremin' => '5.0',
+                    'requiremax' => '5.0',
+                ],
+                false
+            ],
+            // app too new
+            [
+                '5.0.0.0',
+                [
+                    'requiremin' => '6.0',
+                    'requiremax' => '6.0',
+                ],
+                false
+            ],
+            // only min specified
+            [
+                '6.0.0.0',
+                [
+                    'requiremin' => '6.0',
+                ],
+                true
+            ],
+            // only min specified fail
+            [
+                '5.0.0.0',
+                [
+                    'requiremin' => '6.0',
+                ],
+                false
+            ],
+            // only min specified legacy
+            [
+                '6.0.0.0',
+                [
+                    'require' => '6.0',
+                ],
+                true
+            ],
+            // only min specified legacy fail
+            [
+                '4.0.0.0',
+                [
+                    'require' => '6.0',
+                ],
+                false
+            ],
+            // only max specified
+            [
+                '5.0.0.0',
+                [
+                    'requiremax' => '6.0',
+                ],
+                true
+            ],
+            // only max specified fail
+            [
+                '7.0.0.0',
+                [
+                    'requiremax' => '6.0',
+                ],
+                false
+            ],
+            // variations of versions
+            // single OC number
+            [
+                '4',
+                [
+                    'require' => '4.0',
+                ],
+                true
+            ],
+            // multiple OC number
+            [
+                '4.3.1',
+                [
+                    'require' => '4.3',
+                ],
+                true
+            ],
+            // single app number
+            [
+                '4',
+                [
+                    'require' => '4',
+                ],
+                true
+            ],
+            // single app number fail
+            [
+                '4.3',
+                [
+                    'require' => '5',
+                ],
+                false
+            ],
+            // complex
+            [
+                '5.0.0',
+                [
+                    'require' => '4.5.1',
+                ],
+                true
+            ],
+            // complex fail
+            [
+                '4.3.1',
+                [
+                    'require' => '4.3.2',
+                ],
+                false
+            ],
+            // two numbers
+            [
+                '4.3.1',
+                [
+                    'require' => '4.4',
+                ],
+                false
+            ],
+            // one number fail
+            [
+                '4.3.1',
+                [
+                    'require' => '5',
+                ],
+                false
+            ],
+            // pre-alpha app
+            [
+                '5.0.3',
+                [
+                    'require' => '4.93',
+                ],
+                true
+            ],
+            // pre-alpha OC
+            [
+                '6.90.0.2',
+                [
+                    'require' => '6.90',
+                ],
+                true
+            ],
+            // pre-alpha OC max
+            [
+                '6.90.0.2',
+                [
+                    'requiremax' => '7',
+                ],
+                true
+            ],
+            // expect same major number match
+            [
+                '5.0.3',
+                [
+                    'require' => '5',
+                ],
+                true
+            ],
+            // expect same major number match
+            [
+                '5.0.3',
+                [
+                    'requiremax' => '5',
+                ],
+                true
+            ],
+            // dependencies versions before require*
+            [
+                '6.0.0.0',
+                [
+                    'requiremin' => '5.0',
+                    'requiremax' => '7.0',
+                    'dependencies' => [
+                        'owncloud' => [
+                            '@attributes' => [
+                                'min-version' => '7.0',
+                                'max-version' => '7.0',
+                            ],
+                        ],
+                    ],
+                ],
+                false
+            ],
+            [
+                '6.0.0.0',
+                [
+                    'requiremin' => '5.0',
+                    'requiremax' => '7.0',
+                    'dependencies' => [
+                        'owncloud' => [
+                            '@attributes' => [
+                                'min-version' => '5.0',
+                                'max-version' => '5.0',
+                            ],
+                        ],
+                    ],
+                ],
+                false
+            ],
+            [
+                '6.0.0.0',
+                [
+                    'requiremin' => '5.0',
+                    'requiremax' => '5.0',
+                    'dependencies' => [
+                        'owncloud' => [
+                            '@attributes' => [
+                                'min-version' => '5.0',
+                                'max-version' => '7.0',
+                            ],
+                        ],
+                    ],
+                ],
+                true
+            ],
+            [
+                '9.2.0.0',
+                [
+                    'dependencies' => [
+                        'owncloud' => [
+                            '@attributes' => [
+                                'min-version' => '9.0',
+                                'max-version' => '9.1',
+                            ],
+                        ],
+                        'nextcloud' => [
+                            '@attributes' => [
+                                'min-version' => '9.1',
+                                'max-version' => '9.2',
+                            ],
+                        ],
+                    ],
+                ],
+                true
+            ],
+            [
+                '9.2.0.0',
+                [
+                    'dependencies' => [
+                        'nextcloud' => [
+                            '@attributes' => [
+                                'min-version' => '9.1',
+                                'max-version' => '9.2',
+                            ],
+                        ],
+                    ],
+                ],
+                true
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider appVersionsProvider
+     */
+    public function testIsAppCompatible($ocVersion, $appInfo, $expectedResult): void {
+        $this->assertEquals($expectedResult, \OC_App::isAppCompatible($ocVersion, $appInfo));
+    }
+
+    /**
+     * Tests that the app order is correct
+     */
+    public function testGetEnabledAppsIsSorted(): void {
+        $apps = \OC_App::getEnabledApps();
+        // copy array
+        $sortedApps = $apps;
+        sort($sortedApps);
+        // 'files' is always on top
+        unset($sortedApps[array_search('files', $sortedApps)]);
+        array_unshift($sortedApps, 'files');
+        $this->assertEquals($sortedApps, $apps);
+    }
+
+    /**
+     * Providers for the app config values
+     */
+    public static function appConfigValuesProvider(): array {
+        return [
+            // logged in user1
+            [
+                self::TEST_USER1,
+                [
+                    'files',
+                    'app1',
+                    'app3',
+                    'appforgroup1',
+                    'appforgroup12',
+                    'cloud_federation_api',
+                    'dav',
+                    'federatedfilesharing',
+                    'lookup_server_connector',
+                    'oauth2',
+                    'profile',
+                    'provisioning_api',
+                    'settings',
+                    'theming',
+                    'twofactor_backupcodes',
+                    'viewer',
+                    'workflowengine',
+                ],
+                false
+            ],
+            // logged in user2
+            [
+                self::TEST_USER2,
+                [
+                    'files',
+                    'app1',
+                    'app3',
+                    'appforgroup12',
+                    'appforgroup2',
+                    'cloud_federation_api',
+                    'dav',
+                    'federatedfilesharing',
+                    'lookup_server_connector',
+                    'oauth2',
+                    'profile',
+                    'provisioning_api',
+                    'settings',
+                    'theming',
+                    'twofactor_backupcodes',
+                    'viewer',
+                    'workflowengine',
+                ],
+                false
+            ],
+            // logged in user3
+            [
+                self::TEST_USER3,
+                [
+                    'files',
+                    'app1',
+                    'app3',
+                    'appforgroup1',
+                    'appforgroup12',
+                    'appforgroup2',
+                    'cloud_federation_api',
+                    'dav',
+                    'federatedfilesharing',
+                    'lookup_server_connector',
+                    'oauth2',
+                    'profile',
+                    'provisioning_api',
+                    'settings',
+                    'theming',
+                    'twofactor_backupcodes',
+                    'viewer',
+                    'workflowengine',
+                ],
+                false
+            ],
+            //  no user, returns all apps
+            [
+                null,
+                [
+                    'files',
+                    'app1',
+                    'app3',
+                    'appforgroup1',
+                    'appforgroup12',
+                    'appforgroup2',
+                    'cloud_federation_api',
+                    'dav',
+                    'federatedfilesharing',
+                    'lookup_server_connector',
+                    'oauth2',
+                    'profile',
+                    'provisioning_api',
+                    'settings',
+                    'theming',
+                    'twofactor_backupcodes',
+                    'viewer',
+                    'workflowengine',
+                ],
+                false,
+            ],
+            //  user given, but ask for all
+            [
+                self::TEST_USER1,
+                [
+                    'files',
+                    'app1',
+                    'app3',
+                    'appforgroup1',
+                    'appforgroup12',
+                    'appforgroup2',
+                    'cloud_federation_api',
+                    'dav',
+                    'federatedfilesharing',
+                    'lookup_server_connector',
+                    'oauth2',
+                    'profile',
+                    'provisioning_api',
+                    'settings',
+                    'theming',
+                    'twofactor_backupcodes',
+                    'viewer',
+                    'workflowengine',
+                ],
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * Test enabled apps
+     *
+     * @dataProvider appConfigValuesProvider
+     */
+    public function testEnabledApps($user, $expectedApps, $forceAll): void {
+        $userManager = Server::get(IUserManager::class);
+        $groupManager = Server::get(IGroupManager::class);
+        $user1 = $userManager->createUser(self::TEST_USER1, 'NotAnEasyPassword123456+');
+        $user2 = $userManager->createUser(self::TEST_USER2, 'NotAnEasyPassword123456_');
+        $user3 = $userManager->createUser(self::TEST_USER3, 'NotAnEasyPassword123456?');
+
+        $group1 = $groupManager->createGroup(self::TEST_GROUP1);
+        $group1->addUser($user1);
+        $group1->addUser($user3);
+        $group2 = $groupManager->createGroup(self::TEST_GROUP2);
+        $group2->addUser($user2);
+        $group2->addUser($user3);
+
+        \OC_User::setUserId($user);
+
+        $this->setupAppConfigMock()->expects($this->once())
+            ->method('searchValues')
+            ->willReturn(
+                [
+                    'app3' => 'yes',
+                    'app2' => 'no',
+                    'app1' => 'yes',
+                    'appforgroup1' => '["group1"]',
+                    'appforgroup2' => '["group2"]',
+                    'appforgroup12' => '["group2","group1"]',
+                ]
+            );
+
+        $apps = \OC_App::getEnabledApps(false, $forceAll);
+
+        $this->restoreAppConfig();
+        \OC_User::setUserId(null);
+
+        $user1->delete();
+        $user2->delete();
+        $user3->delete();
+
+        $group1->delete();
+        $group2->delete();
+
+        $this->assertEquals($expectedApps, $apps);
+    }
+
+    /**
+     * Test isEnabledApps() with cache, not re-reading the list of
+     * enabled apps more than once when a user is set.
+     */
+    public function testEnabledAppsCache(): void {
+        $userManager = Server::get(IUserManager::class);
+        $user1 = $userManager->createUser(self::TEST_USER1, 'NotAnEasyPassword123456+');
+
+        \OC_User::setUserId(self::TEST_USER1);
+
+        $this->setupAppConfigMock()->expects($this->once())
+            ->method('searchValues')
+            ->willReturn(
+                [
+                    'app3' => 'yes',
+                    'app2' => 'no',
+                ]
+            );
+
+        $apps = \OC_App::getEnabledApps();
+        $this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'profile', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps);
+
+        // mock should not be called again here
+        $apps = \OC_App::getEnabledApps();
+        $this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'profile', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps);
+
+        $this->restoreAppConfig();
+        \OC_User::setUserId(null);
+
+        $user1->delete();
+    }
+
+
+    private function setupAppConfigMock() {
+        /** @var AppConfig|MockObject */
+        $appConfig = $this->getMockBuilder(AppConfig::class)
+            ->onlyMethods(['searchValues'])
+            ->setConstructorArgs([Server::get(IDBConnection::class)])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->registerAppConfig($appConfig);
+        return $appConfig;
+    }
+
+    /**
+     * Register an app config mock for testing purposes.
+     *
+     * @param IAppConfig $appConfig app config mock
+     */
+    private function registerAppConfig(AppConfig $appConfig) {
+        $this->overwriteService(AppConfig::class, $appConfig);
+        $this->overwriteService(AppManager::class, new AppManager(
+            Server::get(IUserSession::class),
+            Server::get(IConfig::class),
+            Server::get(IGroupManager::class),
+            Server::get(ICacheFactory::class),
+            Server::get(IEventDispatcher::class),
+            Server::get(LoggerInterface::class),
+            Server::get(ServerVersion::class),
+            \OCP\Server::get(ConfigManager::class),
+        ));
+    }
+
+    /**
+     * Restore the original app config service.
+     */
+    private function restoreAppConfig() {
+        $this->restoreService(AppConfig::class);
+        $this->restoreService(AppManager::class);
+
+        // Remove the cache of the mocked apps list with a forceRefresh
+        \OC_App::getEnabledApps();
+    }
+
+    /**
+     * Providers for the app data values
+     */
+    public static function appDataProvider(): array {
+        return [
+            [
+                ['description' => " \t  This is a multiline \n test with \n \t \n \n some new lines   "],
+                ['description' => "This is a multiline \n test with \n \t \n \n some new lines"],
+            ],
+            [
+                ['description' => " \t  This is a multiline \n test with \n \t   some new lines   "],
+                ['description' => "This is a multiline \n test with \n \t   some new lines"],
+            ],
+            [
+                ['description' => hex2bin('5065726d657420646520732761757468656e7469666965722064616e732070697769676f20646972656374656d656e74206176656320736573206964656e74696669616e7473206f776e636c6f75642073616e73206c65732072657461706572206574206d657420c3a0206a6f757273206365757820636920656e20636173206465206368616e67656d656e74206465206d6f742064652070617373652e0d0a0d')],
+                ['description' => "Permet de s'authentifier dans piwigo directement avec ses identifiants owncloud sans les retaper et met à jours ceux ci en cas de changement de mot de passe."],
+            ],
+            [
+                ['not-a-description' => " \t  This is a multiline \n test with \n \t   some new lines   "],
+                [
+                    'not-a-description' => " \t  This is a multiline \n test with \n \t   some new lines   ",
+                    'description' => '',
+                ],
+            ],
+            [
+                ['description' => [100, 'bla']],
+                ['description' => ''],
+            ],
+        ];
+    }
+
+    /**
+     * Test app info parser
+     *
+     * @dataProvider appDataProvider
+     * @param array $data
+     * @param array $expected
+     */
+    public function testParseAppInfo(array $data, array $expected): void {
+        $this->assertSame($expected, \OC_App::parseAppInfo($data));
+    }
+
+    public function testParseAppInfoL10N(): void {
+        $parser = new InfoParser();
+        $data = $parser->parse(\OC::$SERVERROOT . '/tests/data/app/description-multi-lang.xml');
+        $this->assertEquals('English', \OC_App::parseAppInfo($data, 'en')['description']);
+        $this->assertEquals('German', \OC_App::parseAppInfo($data, 'de')['description']);
+    }
+
+    public function testParseAppInfoL10NSingleLanguage(): void {
+        $parser = new InfoParser();
+        $data = $parser->parse(\OC::$SERVERROOT . '/tests/data/app/description-single-lang.xml');
+        $this->assertEquals('English', \OC_App::parseAppInfo($data, 'en')['description']);
+    }
 }

tests/lib/App/AppManagerTest.php

Indentation +853 added lines, -853 removed lines

@@ -37,858 +37,858 @@
  * @package Test\App
  */
 class AppManagerTest extends TestCase {
-	protected function getAppConfig(): AppConfig&MockObject {
-		$appConfig = [];
-		$config = $this->createMock(AppConfig::class);
-
-		$config->expects($this->any())
-			->method('getValue')
-			->willReturnCallback(function ($app, $key, $default) use (&$appConfig) {
-				return (isset($appConfig[$app]) and isset($appConfig[$app][$key])) ? $appConfig[$app][$key] : $default;
-			});
-		$config->expects($this->any())
-			->method('setValue')
-			->willReturnCallback(function ($app, $key, $value) use (&$appConfig): void {
-				if (!isset($appConfig[$app])) {
-					$appConfig[$app] = [];
-				}
-				$appConfig[$app][$key] = $value;
-			});
-		$config->expects($this->any())
-			->method('getValues')
-			->willReturnCallback(function ($app, $key) use (&$appConfig) {
-				if ($app) {
-					return $appConfig[$app];
-				} else {
-					$values = [];
-					foreach ($appConfig as $appid => $appData) {
-						if (isset($appData[$key])) {
-							$values[$appid] = $appData[$key];
-						}
-					}
-					return $values;
-				}
-			});
-		$config->expects($this->any())
-			->method('searchValues')
-			->willReturnCallback(function ($key, $lazy, $type) use (&$appConfig) {
-				$values = [];
-				foreach ($appConfig as $appid => $appData) {
-					if (isset($appData[$key])) {
-						$values[$appid] = $appData[$key];
-					}
-				}
-				return $values;
-			});
-
-		return $config;
-	}
-
-	protected IUserSession&MockObject $userSession;
-	private IConfig&MockObject $config;
-	protected IGroupManager&MockObject $groupManager;
-	protected AppConfig&MockObject $appConfig;
-	protected ICache&MockObject $cache;
-	protected ICacheFactory&MockObject $cacheFactory;
-	protected IEventDispatcher&MockObject $eventDispatcher;
-	protected LoggerInterface&MockObject $logger;
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected ServerVersion&MockObject $serverVersion;
-	protected ConfigManager&MockObject $configManager;
-
-	/** @var IAppManager */
-	protected $manager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->appConfig = $this->getAppConfig();
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->cache = $this->createMock(ICache::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->serverVersion = $this->createMock(ServerVersion::class);
-		$this->configManager = $this->createMock(ConfigManager::class);
-
-		$this->overwriteService(AppConfig::class, $this->appConfig);
-		$this->overwriteService(IURLGenerator::class, $this->urlGenerator);
-
-		$this->cacheFactory->expects($this->any())
-			->method('createDistributed')
-			->with('settings')
-			->willReturn($this->cache);
-
-		$this->config
-			->method('getSystemValueBool')
-			->with('installed', false)
-			->willReturn(true);
-
-		$this->manager = new AppManager(
-			$this->userSession,
-			$this->config,
-			$this->groupManager,
-			$this->cacheFactory,
-			$this->eventDispatcher,
-			$this->logger,
-			$this->serverVersion,
-			$this->configManager,
-		);
-	}
-
-	/**
-	 * @dataProvider dataGetAppIcon
-	 */
-	public function testGetAppIcon($callback, ?bool $dark, ?string $expected): void {
-		$this->urlGenerator->expects($this->atLeastOnce())
-			->method('imagePath')
-			->willReturnCallback($callback);
-
-		if ($dark !== null) {
-			$this->assertEquals($expected, $this->manager->getAppIcon('test', $dark));
-		} else {
-			$this->assertEquals($expected, $this->manager->getAppIcon('test'));
-		}
-	}
-
-	public static function dataGetAppIcon(): array {
-		$nothing = function ($appId): void {
-			self::assertEquals('test', $appId);
-			throw new \RuntimeException();
-		};
-
-		$createCallback = function ($workingIcons) {
-			return function ($appId, $icon) use ($workingIcons) {
-				self::assertEquals('test', $appId);
-				if (in_array($icon, $workingIcons)) {
-					return '/path/' . $icon;
-				}
-				throw new \RuntimeException();
-			};
-		};
-
-		return [
-			'does not find anything' => [
-				$nothing,
-				false,
-				null,
-			],
-			'nothing if request dark but only bright available' => [
-				$createCallback(['app.svg']),
-				true,
-				null,
-			],
-			'nothing if request bright but only dark available' => [
-				$createCallback(['app-dark.svg']),
-				false,
-				null,
-			],
-			'bright and only app.svg' => [
-				$createCallback(['app.svg']),
-				false,
-				'/path/app.svg',
-			],
-			'dark and only app-dark.svg' => [
-				$createCallback(['app-dark.svg']),
-				true,
-				'/path/app-dark.svg',
-			],
-			'dark only appname -dark.svg' => [
-				$createCallback(['test-dark.svg']),
-				true,
-				'/path/test-dark.svg',
-			],
-			'bright and only appname.svg' => [
-				$createCallback(['test.svg']),
-				false,
-				'/path/test.svg',
-			],
-			'priotize custom over default' => [
-				$createCallback(['app.svg', 'test.svg']),
-				false,
-				'/path/test.svg',
-			],
-			'defaults to bright' => [
-				$createCallback(['test-dark.svg', 'test.svg']),
-				null,
-				'/path/test.svg',
-			],
-			'no dark icon on default' => [
-				$createCallback(['test-dark.svg', 'test.svg', 'app-dark.svg', 'app.svg']),
-				false,
-				'/path/test.svg',
-			],
-			'no bright icon on dark' => [
-				$createCallback(['test-dark.svg', 'test.svg', 'app-dark.svg', 'app.svg']),
-				true,
-				'/path/test-dark.svg',
-			],
-		];
-	}
-
-	public function testEnableApp(): void {
-		// making sure "files_trashbin" is disabled
-		if ($this->manager->isEnabledForUser('files_trashbin')) {
-			$this->manager->disableApp('files_trashbin');
-		}
-		$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new AppEnableEvent('files_trashbin'));
-		$this->manager->enableApp('files_trashbin');
-		$this->assertEquals('yes', $this->appConfig->getValue('files_trashbin', 'enabled', 'no'));
-	}
-
-	public function testDisableApp(): void {
-		$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new AppDisableEvent('files_trashbin'));
-		$this->manager->disableApp('files_trashbin');
-		$this->assertEquals('no', $this->appConfig->getValue('files_trashbin', 'enabled', 'no'));
-	}
-
-	public function testNotEnableIfNotInstalled(): void {
-		try {
-			$this->manager->enableApp('some_random_name_which_i_hope_is_not_an_app');
-			$this->assertFalse(true, 'If this line is reached the expected exception is not thrown.');
-		} catch (AppPathNotFoundException $e) {
-			// Exception is expected
-			$this->assertEquals('Could not find path for some_random_name_which_i_hope_is_not_an_app', $e->getMessage());
-		}
-
-		$this->assertEquals('no', $this->appConfig->getValue(
-			'some_random_name_which_i_hope_is_not_an_app', 'enabled', 'no'
-		));
-	}
-
-	public function testEnableAppForGroups(): void {
-		$group1 = $this->createMock(IGroup::class);
-		$group1->method('getGID')
-			->willReturn('group1');
-		$group2 = $this->createMock(IGroup::class);
-		$group2->method('getGID')
-			->willReturn('group2');
-
-		$groups = [$group1, $group2];
-
-		/** @var AppManager|MockObject $manager */
-		$manager = $this->getMockBuilder(AppManager::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->config,
-				$this->groupManager,
-				$this->cacheFactory,
-				$this->eventDispatcher,
-				$this->logger,
-				$this->serverVersion,
-				$this->configManager,
-			])
-			->onlyMethods([
-				'getAppPath',
-			])
-			->getMock();
-
-		$manager->expects($this->exactly(2))
-			->method('getAppPath')
-			->with('test')
-			->willReturn('apps/test');
-
-		$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new AppEnableEvent('test', ['group1', 'group2']));
-
-		$manager->enableAppForGroups('test', $groups);
-		$this->assertEquals('["group1","group2"]', $this->appConfig->getValue('test', 'enabled', 'no'));
-	}
-
-	public static function dataEnableAppForGroupsAllowedTypes(): array {
-		return [
-			[[]],
-			[[
-				'types' => [],
-			]],
-			[[
-				'types' => ['nickvergessen'],
-			]],
-		];
-	}
-
-	/**
-	 * @dataProvider dataEnableAppForGroupsAllowedTypes
-	 *
-	 * @param array $appInfo
-	 */
-	public function testEnableAppForGroupsAllowedTypes(array $appInfo): void {
-		$group1 = $this->createMock(IGroup::class);
-		$group1->method('getGID')
-			->willReturn('group1');
-		$group2 = $this->createMock(IGroup::class);
-		$group2->method('getGID')
-			->willReturn('group2');
-
-		$groups = [$group1, $group2];
-
-		/** @var AppManager|MockObject $manager */
-		$manager = $this->getMockBuilder(AppManager::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->config,
-				$this->groupManager,
-				$this->cacheFactory,
-				$this->eventDispatcher,
-				$this->logger,
-				$this->serverVersion,
-				$this->configManager,
-			])
-			->onlyMethods([
-				'getAppPath',
-				'getAppInfo',
-			])
-			->getMock();
-
-		$manager->expects($this->once())
-			->method('getAppPath')
-			->with('test')
-			->willReturn('');
-
-		$manager->expects($this->once())
-			->method('getAppInfo')
-			->with('test')
-			->willReturn($appInfo);
-
-		$this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new AppEnableEvent('test', ['group1', 'group2']));
-
-		$manager->enableAppForGroups('test', $groups);
-		$this->assertEquals('["group1","group2"]', $this->appConfig->getValue('test', 'enabled', 'no'));
-	}
-
-	public static function dataEnableAppForGroupsForbiddenTypes(): array {
-		return [
-			['filesystem'],
-			['prelogin'],
-			['authentication'],
-			['logging'],
-			['prevent_group_restriction'],
-		];
-	}
-
-	/**
-	 * @dataProvider dataEnableAppForGroupsForbiddenTypes
-	 *
-	 * @param string $type
-	 *
-	 */
-	public function testEnableAppForGroupsForbiddenTypes($type): void {
-		$this->expectException(\Exception::class);
-		$this->expectExceptionMessage('test can\'t be enabled for groups.');
-
-		$group1 = $this->createMock(IGroup::class);
-		$group1->method('getGID')
-			->willReturn('group1');
-		$group2 = $this->createMock(IGroup::class);
-		$group2->method('getGID')
-			->willReturn('group2');
-
-		$groups = [$group1, $group2];
-
-		/** @var AppManager|MockObject $manager */
-		$manager = $this->getMockBuilder(AppManager::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->config,
-				$this->groupManager,
-				$this->cacheFactory,
-				$this->eventDispatcher,
-				$this->logger,
-				$this->serverVersion,
-				$this->configManager,
-			])
-			->onlyMethods([
-				'getAppPath',
-				'getAppInfo',
-			])
-			->getMock();
-
-		$manager->expects($this->once())
-			->method('getAppPath')
-			->with('test')
-			->willReturn('');
-
-		$manager->expects($this->once())
-			->method('getAppInfo')
-			->with('test')
-			->willReturn([
-				'types' => [$type],
-			]);
-
-		$this->eventDispatcher->expects($this->never())->method('dispatchTyped')->with(new AppEnableEvent('test', ['group1', 'group2']));
-
-		$manager->enableAppForGroups('test', $groups);
-	}
-
-	public function testIsInstalledEnabled(): void {
-		$this->appConfig->setValue('test', 'enabled', 'yes');
-		$this->assertTrue($this->manager->isEnabledForAnyone('test'));
-	}
-
-	public function testIsInstalledDisabled(): void {
-		$this->appConfig->setValue('test', 'enabled', 'no');
-		$this->assertFalse($this->manager->isEnabledForAnyone('test'));
-	}
-
-	public function testIsInstalledEnabledForGroups(): void {
-		$this->appConfig->setValue('test', 'enabled', '["foo"]');
-		$this->assertTrue($this->manager->isEnabledForAnyone('test'));
-	}
-
-	private function newUser($uid) {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn($uid);
-
-		return $user;
-	}
-
-	public function testIsEnabledForUserEnabled(): void {
-		$this->appConfig->setValue('test', 'enabled', 'yes');
-		$user = $this->newUser('user1');
-		$this->assertTrue($this->manager->isEnabledForUser('test', $user));
-	}
-
-	public function testIsEnabledForUserDisabled(): void {
-		$this->appConfig->setValue('test', 'enabled', 'no');
-		$user = $this->newUser('user1');
-		$this->assertFalse($this->manager->isEnabledForUser('test', $user));
-	}
-
-	public function testGetAppPath(): void {
-		$this->assertEquals(\OC::$SERVERROOT . '/apps/files', $this->manager->getAppPath('files'));
-	}
-
-	public function testGetAppPathSymlink(): void {
-		$fakeAppDirname = sha1(uniqid('test', true));
-		$fakeAppPath = sys_get_temp_dir() . '/' . $fakeAppDirname;
-		$fakeAppLink = \OC::$SERVERROOT . '/' . $fakeAppDirname;
-
-		mkdir($fakeAppPath);
-		if (symlink($fakeAppPath, $fakeAppLink) === false) {
-			$this->markTestSkipped('Failed to create symlink');
-		}
-
-		// Use the symlink as the app path
-		\OC::$APPSROOTS[] = [
-			'path' => $fakeAppLink,
-			'url' => \OC::$WEBROOT . '/' . $fakeAppDirname,
-			'writable' => false,
-		];
-
-		$fakeTestAppPath = $fakeAppPath . '/' . 'test-test-app';
-		mkdir($fakeTestAppPath);
-
-		$generatedAppPath = $this->manager->getAppPath('test-test-app');
-
-		rmdir($fakeTestAppPath);
-		unlink($fakeAppLink);
-		rmdir($fakeAppPath);
-
-		$this->assertEquals($fakeAppLink . '/test-test-app', $generatedAppPath);
-	}
-
-	public function testGetAppPathFail(): void {
-		$this->expectException(AppPathNotFoundException::class);
-		$this->manager->getAppPath('testnotexisting');
-	}
-
-	public function testIsEnabledForUserEnabledForGroup(): void {
-		$user = $this->newUser('user1');
-		$this->groupManager->expects($this->once())
-			->method('getUserGroupIds')
-			->with($user)
-			->willReturn(['foo', 'bar']);
-
-		$this->appConfig->setValue('test', 'enabled', '["foo"]');
-		$this->assertTrue($this->manager->isEnabledForUser('test', $user));
-	}
-
-	public function testIsEnabledForUserDisabledForGroup(): void {
-		$user = $this->newUser('user1');
-		$this->groupManager->expects($this->once())
-			->method('getUserGroupIds')
-			->with($user)
-			->willReturn(['bar']);
-
-		$this->appConfig->setValue('test', 'enabled', '["foo"]');
-		$this->assertFalse($this->manager->isEnabledForUser('test', $user));
-	}
-
-	public function testIsEnabledForUserLoggedOut(): void {
-		$this->appConfig->setValue('test', 'enabled', '["foo"]');
-		$this->assertFalse($this->manager->isEnabledForUser('test'));
-	}
-
-	public function testIsEnabledForUserLoggedIn(): void {
-		$user = $this->newUser('user1');
-
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->groupManager->expects($this->once())
-			->method('getUserGroupIds')
-			->with($user)
-			->willReturn(['foo', 'bar']);
-
-		$this->appConfig->setValue('test', 'enabled', '["foo"]');
-		$this->assertTrue($this->manager->isEnabledForUser('test'));
-	}
-
-	public function testGetEnabledApps(): void {
-		$this->appConfig->setValue('test1', 'enabled', 'yes');
-		$this->appConfig->setValue('test2', 'enabled', 'no');
-		$this->appConfig->setValue('test3', 'enabled', '["foo"]');
-		$apps = [
-			'cloud_federation_api',
-			'dav',
-			'federatedfilesharing',
-			'files',
-			'lookup_server_connector',
-			'oauth2',
-			'profile',
-			'provisioning_api',
-			'settings',
-			'test1',
-			'test3',
-			'theming',
-			'twofactor_backupcodes',
-			'viewer',
-			'workflowengine',
-		];
-		$this->assertEquals($apps, $this->manager->getEnabledApps());
-	}
-
-	public function testGetAppsForUser(): void {
-		$user = $this->newUser('user1');
-		$this->groupManager->expects($this->any())
-			->method('getUserGroupIds')
-			->with($user)
-			->willReturn(['foo', 'bar']);
-
-		$this->appConfig->setValue('test1', 'enabled', 'yes');
-		$this->appConfig->setValue('test2', 'enabled', 'no');
-		$this->appConfig->setValue('test3', 'enabled', '["foo"]');
-		$this->appConfig->setValue('test4', 'enabled', '["asd"]');
-		$enabled = [
-			'cloud_federation_api',
-			'dav',
-			'federatedfilesharing',
-			'files',
-			'lookup_server_connector',
-			'oauth2',
-			'profile',
-			'provisioning_api',
-			'settings',
-			'test1',
-			'test3',
-			'theming',
-			'twofactor_backupcodes',
-			'viewer',
-			'workflowengine',
-		];
-		$this->assertEquals($enabled, $this->manager->getEnabledAppsForUser($user));
-	}
-
-	public function testGetAppsNeedingUpgrade(): void {
-		/** @var AppManager|MockObject $manager */
-		$manager = $this->getMockBuilder(AppManager::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->config,
-				$this->groupManager,
-				$this->cacheFactory,
-				$this->eventDispatcher,
-				$this->logger,
-				$this->serverVersion,
-				$this->configManager,
-			])
-			->onlyMethods(['getAppInfo'])
-			->getMock();
-
-		$appInfos = [
-			'cloud_federation_api' => ['id' => 'cloud_federation_api'],
-			'dav' => ['id' => 'dav'],
-			'files' => ['id' => 'files'],
-			'federatedfilesharing' => ['id' => 'federatedfilesharing'],
-			'profile' => ['id' => 'profile'],
-			'provisioning_api' => ['id' => 'provisioning_api'],
-			'lookup_server_connector' => ['id' => 'lookup_server_connector'],
-			'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '9.0.0'],
-			'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
-			'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
-			'test4' => ['id' => 'test4', 'version' => '3.0.0', 'requiremin' => '8.1.0'],
-			'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
-			'settings' => ['id' => 'settings'],
-			'theming' => ['id' => 'theming'],
-			'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'],
-			'viewer' => ['id' => 'viewer'],
-			'workflowengine' => ['id' => 'workflowengine'],
-			'oauth2' => ['id' => 'oauth2'],
-		];
-
-		$manager->expects($this->any())
-			->method('getAppInfo')
-			->willReturnCallback(
-				function ($appId) use ($appInfos) {
-					return $appInfos[$appId];
-				}
-			);
-
-		$this->appConfig->setValue('test1', 'enabled', 'yes');
-		$this->appConfig->setValue('test1', 'installed_version', '1.0.0');
-		$this->appConfig->setValue('test2', 'enabled', 'yes');
-		$this->appConfig->setValue('test2', 'installed_version', '1.0.0');
-		$this->appConfig->setValue('test3', 'enabled', 'yes');
-		$this->appConfig->setValue('test3', 'installed_version', '1.0.0');
-		$this->appConfig->setValue('test4', 'enabled', 'yes');
-		$this->appConfig->setValue('test4', 'installed_version', '2.4.0');
-
-		$apps = $manager->getAppsNeedingUpgrade('8.2.0');
-
-		$this->assertCount(2, $apps);
-		$this->assertEquals('test1', $apps[0]['id']);
-		$this->assertEquals('test4', $apps[1]['id']);
-	}
-
-	public function testGetIncompatibleApps(): void {
-		/** @var AppManager|MockObject $manager */
-		$manager = $this->getMockBuilder(AppManager::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->config,
-				$this->groupManager,
-				$this->cacheFactory,
-				$this->eventDispatcher,
-				$this->logger,
-				$this->serverVersion,
-				$this->configManager,
-			])
-			->onlyMethods(['getAppInfo'])
-			->getMock();
-
-		$appInfos = [
-			'cloud_federation_api' => ['id' => 'cloud_federation_api'],
-			'dav' => ['id' => 'dav'],
-			'files' => ['id' => 'files'],
-			'federatedfilesharing' => ['id' => 'federatedfilesharing'],
-			'profile' => ['id' => 'profile'],
-			'provisioning_api' => ['id' => 'provisioning_api'],
-			'lookup_server_connector' => ['id' => 'lookup_server_connector'],
-			'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '8.0.0'],
-			'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
-			'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
-			'settings' => ['id' => 'settings'],
-			'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
-			'theming' => ['id' => 'theming'],
-			'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'],
-			'workflowengine' => ['id' => 'workflowengine'],
-			'oauth2' => ['id' => 'oauth2'],
-			'viewer' => ['id' => 'viewer'],
-		];
-
-		$manager->expects($this->any())
-			->method('getAppInfo')
-			->willReturnCallback(
-				function ($appId) use ($appInfos) {
-					return $appInfos[$appId];
-				}
-			);
-
-		$this->appConfig->setValue('test1', 'enabled', 'yes');
-		$this->appConfig->setValue('test2', 'enabled', 'yes');
-		$this->appConfig->setValue('test3', 'enabled', 'yes');
-
-		$apps = $manager->getIncompatibleApps('8.2.0');
-
-		$this->assertCount(2, $apps);
-		$this->assertEquals('test1', $apps[0]['id']);
-		$this->assertEquals('test3', $apps[1]['id']);
-	}
-
-	public function testGetEnabledAppsForGroup(): void {
-		$group = $this->createMock(IGroup::class);
-		$group->expects($this->any())
-			->method('getGID')
-			->willReturn('foo');
-
-		$this->appConfig->setValue('test1', 'enabled', 'yes');
-		$this->appConfig->setValue('test2', 'enabled', 'no');
-		$this->appConfig->setValue('test3', 'enabled', '["foo"]');
-		$this->appConfig->setValue('test4', 'enabled', '["asd"]');
-		$enabled = [
-			'cloud_federation_api',
-			'dav',
-			'federatedfilesharing',
-			'files',
-			'lookup_server_connector',
-			'oauth2',
-			'profile',
-			'provisioning_api',
-			'settings',
-			'test1',
-			'test3',
-			'theming',
-			'twofactor_backupcodes',
-			'viewer',
-			'workflowengine',
-		];
-		$this->assertEquals($enabled, $this->manager->getEnabledAppsForGroup($group));
-	}
-
-	public function testGetAppRestriction(): void {
-		$this->appConfig->setValue('test1', 'enabled', 'yes');
-		$this->appConfig->setValue('test2', 'enabled', 'no');
-		$this->appConfig->setValue('test3', 'enabled', '["foo"]');
-
-		$this->assertEquals([], $this->manager->getAppRestriction('test1'));
-		$this->assertEquals([], $this->manager->getAppRestriction('test2'));
-		$this->assertEquals(['foo'], $this->manager->getAppRestriction('test3'));
-	}
-
-	public static function isBackendRequiredDataProvider(): array {
-		return [
-			// backend available
-			[
-				'caldav',
-				['app1' => ['caldav']],
-				true,
-			],
-			[
-				'caldav',
-				['app1' => [], 'app2' => ['foo'], 'app3' => ['caldav']],
-				true,
-			],
-			// backend not available
-			[
-				'caldav',
-				['app3' => [], 'app1' => ['foo'], 'app2' => ['bar', 'baz']],
-				false,
-			],
-			// no app available
-			[
-				'caldav',
-				[],
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider isBackendRequiredDataProvider
-	 */
-	public function testIsBackendRequired(
-		string $backend,
-		array $appBackends,
-		bool $expected,
-	): void {
-		$appInfoData = array_map(
-			static fn (array $backends) => ['dependencies' => ['backend' => $backends]],
-			$appBackends,
-		);
-
-		$reflection = new \ReflectionClass($this->manager);
-		$property = $reflection->getProperty('appInfos');
-		$property->setValue($this->manager, $appInfoData);
-
-		$this->assertEquals($expected, $this->manager->isBackendRequired($backend));
-	}
-
-	public function testGetAppVersion() {
-		$manager = $this->getMockBuilder(AppManager::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->config,
-				$this->groupManager,
-				$this->cacheFactory,
-				$this->eventDispatcher,
-				$this->logger,
-				$this->serverVersion,
-				$this->configManager,
-			])
-			->onlyMethods([
-				'getAppInfo',
-			])
-			->getMock();
-
-		$manager->expects(self::once())
-			->method('getAppInfo')
-			->with('myapp')
-			->willReturn(['version' => '99.99.99-rc.99']);
-
-		$this->serverVersion
-			->expects(self::never())
-			->method('getVersionString');
-
-		$this->assertEquals(
-			'99.99.99-rc.99',
-			$manager->getAppVersion('myapp'),
-		);
-	}
-
-	public function testGetAppVersionCore() {
-		$manager = $this->getMockBuilder(AppManager::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->config,
-				$this->groupManager,
-				$this->cacheFactory,
-				$this->eventDispatcher,
-				$this->logger,
-				$this->serverVersion,
-				$this->configManager,
-			])
-			->onlyMethods([
-				'getAppInfo',
-			])
-			->getMock();
-
-		$manager->expects(self::never())
-			->method('getAppInfo');
-
-		$this->serverVersion
-			->expects(self::once())
-			->method('getVersionString')
-			->willReturn('1.2.3-beta.4');
-
-		$this->assertEquals(
-			'1.2.3-beta.4',
-			$manager->getAppVersion('core'),
-		);
-	}
-
-	public function testGetAppVersionUnknown() {
-		$manager = $this->getMockBuilder(AppManager::class)
-			->setConstructorArgs([
-				$this->userSession,
-				$this->config,
-				$this->groupManager,
-				$this->cacheFactory,
-				$this->eventDispatcher,
-				$this->logger,
-				$this->serverVersion,
-				$this->configManager,
-			])
-			->onlyMethods([
-				'getAppInfo',
-			])
-			->getMock();
-
-		$manager->expects(self::once())
-			->method('getAppInfo')
-			->with('unknown')
-			->willReturn(null);
-
-		$this->serverVersion
-			->expects(self::never())
-			->method('getVersionString');
-
-		$this->assertEquals(
-			'0',
-			$manager->getAppVersion('unknown'),
-		);
-	}
+    protected function getAppConfig(): AppConfig&MockObject {
+        $appConfig = [];
+        $config = $this->createMock(AppConfig::class);
+
+        $config->expects($this->any())
+            ->method('getValue')
+            ->willReturnCallback(function ($app, $key, $default) use (&$appConfig) {
+                return (isset($appConfig[$app]) and isset($appConfig[$app][$key])) ? $appConfig[$app][$key] : $default;
+            });
+        $config->expects($this->any())
+            ->method('setValue')
+            ->willReturnCallback(function ($app, $key, $value) use (&$appConfig): void {
+                if (!isset($appConfig[$app])) {
+                    $appConfig[$app] = [];
+                }
+                $appConfig[$app][$key] = $value;
+            });
+        $config->expects($this->any())
+            ->method('getValues')
+            ->willReturnCallback(function ($app, $key) use (&$appConfig) {
+                if ($app) {
+                    return $appConfig[$app];
+                } else {
+                    $values = [];
+                    foreach ($appConfig as $appid => $appData) {
+                        if (isset($appData[$key])) {
+                            $values[$appid] = $appData[$key];
+                        }
+                    }
+                    return $values;
+                }
+            });
+        $config->expects($this->any())
+            ->method('searchValues')
+            ->willReturnCallback(function ($key, $lazy, $type) use (&$appConfig) {
+                $values = [];
+                foreach ($appConfig as $appid => $appData) {
+                    if (isset($appData[$key])) {
+                        $values[$appid] = $appData[$key];
+                    }
+                }
+                return $values;
+            });
+
+        return $config;
+    }
+
+    protected IUserSession&MockObject $userSession;
+    private IConfig&MockObject $config;
+    protected IGroupManager&MockObject $groupManager;
+    protected AppConfig&MockObject $appConfig;
+    protected ICache&MockObject $cache;
+    protected ICacheFactory&MockObject $cacheFactory;
+    protected IEventDispatcher&MockObject $eventDispatcher;
+    protected LoggerInterface&MockObject $logger;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected ServerVersion&MockObject $serverVersion;
+    protected ConfigManager&MockObject $configManager;
+
+    /** @var IAppManager */
+    protected $manager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->appConfig = $this->getAppConfig();
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->cache = $this->createMock(ICache::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->serverVersion = $this->createMock(ServerVersion::class);
+        $this->configManager = $this->createMock(ConfigManager::class);
+
+        $this->overwriteService(AppConfig::class, $this->appConfig);
+        $this->overwriteService(IURLGenerator::class, $this->urlGenerator);
+
+        $this->cacheFactory->expects($this->any())
+            ->method('createDistributed')
+            ->with('settings')
+            ->willReturn($this->cache);
+
+        $this->config
+            ->method('getSystemValueBool')
+            ->with('installed', false)
+            ->willReturn(true);
+
+        $this->manager = new AppManager(
+            $this->userSession,
+            $this->config,
+            $this->groupManager,
+            $this->cacheFactory,
+            $this->eventDispatcher,
+            $this->logger,
+            $this->serverVersion,
+            $this->configManager,
+        );
+    }
+
+    /**
+     * @dataProvider dataGetAppIcon
+     */
+    public function testGetAppIcon($callback, ?bool $dark, ?string $expected): void {
+        $this->urlGenerator->expects($this->atLeastOnce())
+            ->method('imagePath')
+            ->willReturnCallback($callback);
+
+        if ($dark !== null) {
+            $this->assertEquals($expected, $this->manager->getAppIcon('test', $dark));
+        } else {
+            $this->assertEquals($expected, $this->manager->getAppIcon('test'));
+        }
+    }
+
+    public static function dataGetAppIcon(): array {
+        $nothing = function ($appId): void {
+            self::assertEquals('test', $appId);
+            throw new \RuntimeException();
+        };
+
+        $createCallback = function ($workingIcons) {
+            return function ($appId, $icon) use ($workingIcons) {
+                self::assertEquals('test', $appId);
+                if (in_array($icon, $workingIcons)) {
+                    return '/path/' . $icon;
+                }
+                throw new \RuntimeException();
+            };
+        };
+
+        return [
+            'does not find anything' => [
+                $nothing,
+                false,
+                null,
+            ],
+            'nothing if request dark but only bright available' => [
+                $createCallback(['app.svg']),
+                true,
+                null,
+            ],
+            'nothing if request bright but only dark available' => [
+                $createCallback(['app-dark.svg']),
+                false,
+                null,
+            ],
+            'bright and only app.svg' => [
+                $createCallback(['app.svg']),
+                false,
+                '/path/app.svg',
+            ],
+            'dark and only app-dark.svg' => [
+                $createCallback(['app-dark.svg']),
+                true,
+                '/path/app-dark.svg',
+            ],
+            'dark only appname -dark.svg' => [
+                $createCallback(['test-dark.svg']),
+                true,
+                '/path/test-dark.svg',
+            ],
+            'bright and only appname.svg' => [
+                $createCallback(['test.svg']),
+                false,
+                '/path/test.svg',
+            ],
+            'priotize custom over default' => [
+                $createCallback(['app.svg', 'test.svg']),
+                false,
+                '/path/test.svg',
+            ],
+            'defaults to bright' => [
+                $createCallback(['test-dark.svg', 'test.svg']),
+                null,
+                '/path/test.svg',
+            ],
+            'no dark icon on default' => [
+                $createCallback(['test-dark.svg', 'test.svg', 'app-dark.svg', 'app.svg']),
+                false,
+                '/path/test.svg',
+            ],
+            'no bright icon on dark' => [
+                $createCallback(['test-dark.svg', 'test.svg', 'app-dark.svg', 'app.svg']),
+                true,
+                '/path/test-dark.svg',
+            ],
+        ];
+    }
+
+    public function testEnableApp(): void {
+        // making sure "files_trashbin" is disabled
+        if ($this->manager->isEnabledForUser('files_trashbin')) {
+            $this->manager->disableApp('files_trashbin');
+        }
+        $this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new AppEnableEvent('files_trashbin'));
+        $this->manager->enableApp('files_trashbin');
+        $this->assertEquals('yes', $this->appConfig->getValue('files_trashbin', 'enabled', 'no'));
+    }
+
+    public function testDisableApp(): void {
+        $this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new AppDisableEvent('files_trashbin'));
+        $this->manager->disableApp('files_trashbin');
+        $this->assertEquals('no', $this->appConfig->getValue('files_trashbin', 'enabled', 'no'));
+    }
+
+    public function testNotEnableIfNotInstalled(): void {
+        try {
+            $this->manager->enableApp('some_random_name_which_i_hope_is_not_an_app');
+            $this->assertFalse(true, 'If this line is reached the expected exception is not thrown.');
+        } catch (AppPathNotFoundException $e) {
+            // Exception is expected
+            $this->assertEquals('Could not find path for some_random_name_which_i_hope_is_not_an_app', $e->getMessage());
+        }
+
+        $this->assertEquals('no', $this->appConfig->getValue(
+            'some_random_name_which_i_hope_is_not_an_app', 'enabled', 'no'
+        ));
+    }
+
+    public function testEnableAppForGroups(): void {
+        $group1 = $this->createMock(IGroup::class);
+        $group1->method('getGID')
+            ->willReturn('group1');
+        $group2 = $this->createMock(IGroup::class);
+        $group2->method('getGID')
+            ->willReturn('group2');
+
+        $groups = [$group1, $group2];
+
+        /** @var AppManager|MockObject $manager */
+        $manager = $this->getMockBuilder(AppManager::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->config,
+                $this->groupManager,
+                $this->cacheFactory,
+                $this->eventDispatcher,
+                $this->logger,
+                $this->serverVersion,
+                $this->configManager,
+            ])
+            ->onlyMethods([
+                'getAppPath',
+            ])
+            ->getMock();
+
+        $manager->expects($this->exactly(2))
+            ->method('getAppPath')
+            ->with('test')
+            ->willReturn('apps/test');
+
+        $this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new AppEnableEvent('test', ['group1', 'group2']));
+
+        $manager->enableAppForGroups('test', $groups);
+        $this->assertEquals('["group1","group2"]', $this->appConfig->getValue('test', 'enabled', 'no'));
+    }
+
+    public static function dataEnableAppForGroupsAllowedTypes(): array {
+        return [
+            [[]],
+            [[
+                'types' => [],
+            ]],
+            [[
+                'types' => ['nickvergessen'],
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider dataEnableAppForGroupsAllowedTypes
+     *
+     * @param array $appInfo
+     */
+    public function testEnableAppForGroupsAllowedTypes(array $appInfo): void {
+        $group1 = $this->createMock(IGroup::class);
+        $group1->method('getGID')
+            ->willReturn('group1');
+        $group2 = $this->createMock(IGroup::class);
+        $group2->method('getGID')
+            ->willReturn('group2');
+
+        $groups = [$group1, $group2];
+
+        /** @var AppManager|MockObject $manager */
+        $manager = $this->getMockBuilder(AppManager::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->config,
+                $this->groupManager,
+                $this->cacheFactory,
+                $this->eventDispatcher,
+                $this->logger,
+                $this->serverVersion,
+                $this->configManager,
+            ])
+            ->onlyMethods([
+                'getAppPath',
+                'getAppInfo',
+            ])
+            ->getMock();
+
+        $manager->expects($this->once())
+            ->method('getAppPath')
+            ->with('test')
+            ->willReturn('');
+
+        $manager->expects($this->once())
+            ->method('getAppInfo')
+            ->with('test')
+            ->willReturn($appInfo);
+
+        $this->eventDispatcher->expects($this->once())->method('dispatchTyped')->with(new AppEnableEvent('test', ['group1', 'group2']));
+
+        $manager->enableAppForGroups('test', $groups);
+        $this->assertEquals('["group1","group2"]', $this->appConfig->getValue('test', 'enabled', 'no'));
+    }
+
+    public static function dataEnableAppForGroupsForbiddenTypes(): array {
+        return [
+            ['filesystem'],
+            ['prelogin'],
+            ['authentication'],
+            ['logging'],
+            ['prevent_group_restriction'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataEnableAppForGroupsForbiddenTypes
+     *
+     * @param string $type
+     *
+     */
+    public function testEnableAppForGroupsForbiddenTypes($type): void {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('test can\'t be enabled for groups.');
+
+        $group1 = $this->createMock(IGroup::class);
+        $group1->method('getGID')
+            ->willReturn('group1');
+        $group2 = $this->createMock(IGroup::class);
+        $group2->method('getGID')
+            ->willReturn('group2');
+
+        $groups = [$group1, $group2];
+
+        /** @var AppManager|MockObject $manager */
+        $manager = $this->getMockBuilder(AppManager::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->config,
+                $this->groupManager,
+                $this->cacheFactory,
+                $this->eventDispatcher,
+                $this->logger,
+                $this->serverVersion,
+                $this->configManager,
+            ])
+            ->onlyMethods([
+                'getAppPath',
+                'getAppInfo',
+            ])
+            ->getMock();
+
+        $manager->expects($this->once())
+            ->method('getAppPath')
+            ->with('test')
+            ->willReturn('');
+
+        $manager->expects($this->once())
+            ->method('getAppInfo')
+            ->with('test')
+            ->willReturn([
+                'types' => [$type],
+            ]);
+
+        $this->eventDispatcher->expects($this->never())->method('dispatchTyped')->with(new AppEnableEvent('test', ['group1', 'group2']));
+
+        $manager->enableAppForGroups('test', $groups);
+    }
+
+    public function testIsInstalledEnabled(): void {
+        $this->appConfig->setValue('test', 'enabled', 'yes');
+        $this->assertTrue($this->manager->isEnabledForAnyone('test'));
+    }
+
+    public function testIsInstalledDisabled(): void {
+        $this->appConfig->setValue('test', 'enabled', 'no');
+        $this->assertFalse($this->manager->isEnabledForAnyone('test'));
+    }
+
+    public function testIsInstalledEnabledForGroups(): void {
+        $this->appConfig->setValue('test', 'enabled', '["foo"]');
+        $this->assertTrue($this->manager->isEnabledForAnyone('test'));
+    }
+
+    private function newUser($uid) {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn($uid);
+
+        return $user;
+    }
+
+    public function testIsEnabledForUserEnabled(): void {
+        $this->appConfig->setValue('test', 'enabled', 'yes');
+        $user = $this->newUser('user1');
+        $this->assertTrue($this->manager->isEnabledForUser('test', $user));
+    }
+
+    public function testIsEnabledForUserDisabled(): void {
+        $this->appConfig->setValue('test', 'enabled', 'no');
+        $user = $this->newUser('user1');
+        $this->assertFalse($this->manager->isEnabledForUser('test', $user));
+    }
+
+    public function testGetAppPath(): void {
+        $this->assertEquals(\OC::$SERVERROOT . '/apps/files', $this->manager->getAppPath('files'));
+    }
+
+    public function testGetAppPathSymlink(): void {
+        $fakeAppDirname = sha1(uniqid('test', true));
+        $fakeAppPath = sys_get_temp_dir() . '/' . $fakeAppDirname;
+        $fakeAppLink = \OC::$SERVERROOT . '/' . $fakeAppDirname;
+
+        mkdir($fakeAppPath);
+        if (symlink($fakeAppPath, $fakeAppLink) === false) {
+            $this->markTestSkipped('Failed to create symlink');
+        }
+
+        // Use the symlink as the app path
+        \OC::$APPSROOTS[] = [
+            'path' => $fakeAppLink,
+            'url' => \OC::$WEBROOT . '/' . $fakeAppDirname,
+            'writable' => false,
+        ];
+
+        $fakeTestAppPath = $fakeAppPath . '/' . 'test-test-app';
+        mkdir($fakeTestAppPath);
+
+        $generatedAppPath = $this->manager->getAppPath('test-test-app');
+
+        rmdir($fakeTestAppPath);
+        unlink($fakeAppLink);
+        rmdir($fakeAppPath);
+
+        $this->assertEquals($fakeAppLink . '/test-test-app', $generatedAppPath);
+    }
+
+    public function testGetAppPathFail(): void {
+        $this->expectException(AppPathNotFoundException::class);
+        $this->manager->getAppPath('testnotexisting');
+    }
+
+    public function testIsEnabledForUserEnabledForGroup(): void {
+        $user = $this->newUser('user1');
+        $this->groupManager->expects($this->once())
+            ->method('getUserGroupIds')
+            ->with($user)
+            ->willReturn(['foo', 'bar']);
+
+        $this->appConfig->setValue('test', 'enabled', '["foo"]');
+        $this->assertTrue($this->manager->isEnabledForUser('test', $user));
+    }
+
+    public function testIsEnabledForUserDisabledForGroup(): void {
+        $user = $this->newUser('user1');
+        $this->groupManager->expects($this->once())
+            ->method('getUserGroupIds')
+            ->with($user)
+            ->willReturn(['bar']);
+
+        $this->appConfig->setValue('test', 'enabled', '["foo"]');
+        $this->assertFalse($this->manager->isEnabledForUser('test', $user));
+    }
+
+    public function testIsEnabledForUserLoggedOut(): void {
+        $this->appConfig->setValue('test', 'enabled', '["foo"]');
+        $this->assertFalse($this->manager->isEnabledForUser('test'));
+    }
+
+    public function testIsEnabledForUserLoggedIn(): void {
+        $user = $this->newUser('user1');
+
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->groupManager->expects($this->once())
+            ->method('getUserGroupIds')
+            ->with($user)
+            ->willReturn(['foo', 'bar']);
+
+        $this->appConfig->setValue('test', 'enabled', '["foo"]');
+        $this->assertTrue($this->manager->isEnabledForUser('test'));
+    }
+
+    public function testGetEnabledApps(): void {
+        $this->appConfig->setValue('test1', 'enabled', 'yes');
+        $this->appConfig->setValue('test2', 'enabled', 'no');
+        $this->appConfig->setValue('test3', 'enabled', '["foo"]');
+        $apps = [
+            'cloud_federation_api',
+            'dav',
+            'federatedfilesharing',
+            'files',
+            'lookup_server_connector',
+            'oauth2',
+            'profile',
+            'provisioning_api',
+            'settings',
+            'test1',
+            'test3',
+            'theming',
+            'twofactor_backupcodes',
+            'viewer',
+            'workflowengine',
+        ];
+        $this->assertEquals($apps, $this->manager->getEnabledApps());
+    }
+
+    public function testGetAppsForUser(): void {
+        $user = $this->newUser('user1');
+        $this->groupManager->expects($this->any())
+            ->method('getUserGroupIds')
+            ->with($user)
+            ->willReturn(['foo', 'bar']);
+
+        $this->appConfig->setValue('test1', 'enabled', 'yes');
+        $this->appConfig->setValue('test2', 'enabled', 'no');
+        $this->appConfig->setValue('test3', 'enabled', '["foo"]');
+        $this->appConfig->setValue('test4', 'enabled', '["asd"]');
+        $enabled = [
+            'cloud_federation_api',
+            'dav',
+            'federatedfilesharing',
+            'files',
+            'lookup_server_connector',
+            'oauth2',
+            'profile',
+            'provisioning_api',
+            'settings',
+            'test1',
+            'test3',
+            'theming',
+            'twofactor_backupcodes',
+            'viewer',
+            'workflowengine',
+        ];
+        $this->assertEquals($enabled, $this->manager->getEnabledAppsForUser($user));
+    }
+
+    public function testGetAppsNeedingUpgrade(): void {
+        /** @var AppManager|MockObject $manager */
+        $manager = $this->getMockBuilder(AppManager::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->config,
+                $this->groupManager,
+                $this->cacheFactory,
+                $this->eventDispatcher,
+                $this->logger,
+                $this->serverVersion,
+                $this->configManager,
+            ])
+            ->onlyMethods(['getAppInfo'])
+            ->getMock();
+
+        $appInfos = [
+            'cloud_federation_api' => ['id' => 'cloud_federation_api'],
+            'dav' => ['id' => 'dav'],
+            'files' => ['id' => 'files'],
+            'federatedfilesharing' => ['id' => 'federatedfilesharing'],
+            'profile' => ['id' => 'profile'],
+            'provisioning_api' => ['id' => 'provisioning_api'],
+            'lookup_server_connector' => ['id' => 'lookup_server_connector'],
+            'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '9.0.0'],
+            'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
+            'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
+            'test4' => ['id' => 'test4', 'version' => '3.0.0', 'requiremin' => '8.1.0'],
+            'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
+            'settings' => ['id' => 'settings'],
+            'theming' => ['id' => 'theming'],
+            'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'],
+            'viewer' => ['id' => 'viewer'],
+            'workflowengine' => ['id' => 'workflowengine'],
+            'oauth2' => ['id' => 'oauth2'],
+        ];
+
+        $manager->expects($this->any())
+            ->method('getAppInfo')
+            ->willReturnCallback(
+                function ($appId) use ($appInfos) {
+                    return $appInfos[$appId];
+                }
+            );
+
+        $this->appConfig->setValue('test1', 'enabled', 'yes');
+        $this->appConfig->setValue('test1', 'installed_version', '1.0.0');
+        $this->appConfig->setValue('test2', 'enabled', 'yes');
+        $this->appConfig->setValue('test2', 'installed_version', '1.0.0');
+        $this->appConfig->setValue('test3', 'enabled', 'yes');
+        $this->appConfig->setValue('test3', 'installed_version', '1.0.0');
+        $this->appConfig->setValue('test4', 'enabled', 'yes');
+        $this->appConfig->setValue('test4', 'installed_version', '2.4.0');
+
+        $apps = $manager->getAppsNeedingUpgrade('8.2.0');
+
+        $this->assertCount(2, $apps);
+        $this->assertEquals('test1', $apps[0]['id']);
+        $this->assertEquals('test4', $apps[1]['id']);
+    }
+
+    public function testGetIncompatibleApps(): void {
+        /** @var AppManager|MockObject $manager */
+        $manager = $this->getMockBuilder(AppManager::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->config,
+                $this->groupManager,
+                $this->cacheFactory,
+                $this->eventDispatcher,
+                $this->logger,
+                $this->serverVersion,
+                $this->configManager,
+            ])
+            ->onlyMethods(['getAppInfo'])
+            ->getMock();
+
+        $appInfos = [
+            'cloud_federation_api' => ['id' => 'cloud_federation_api'],
+            'dav' => ['id' => 'dav'],
+            'files' => ['id' => 'files'],
+            'federatedfilesharing' => ['id' => 'federatedfilesharing'],
+            'profile' => ['id' => 'profile'],
+            'provisioning_api' => ['id' => 'provisioning_api'],
+            'lookup_server_connector' => ['id' => 'lookup_server_connector'],
+            'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '8.0.0'],
+            'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
+            'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
+            'settings' => ['id' => 'settings'],
+            'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
+            'theming' => ['id' => 'theming'],
+            'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'],
+            'workflowengine' => ['id' => 'workflowengine'],
+            'oauth2' => ['id' => 'oauth2'],
+            'viewer' => ['id' => 'viewer'],
+        ];
+
+        $manager->expects($this->any())
+            ->method('getAppInfo')
+            ->willReturnCallback(
+                function ($appId) use ($appInfos) {
+                    return $appInfos[$appId];
+                }
+            );
+
+        $this->appConfig->setValue('test1', 'enabled', 'yes');
+        $this->appConfig->setValue('test2', 'enabled', 'yes');
+        $this->appConfig->setValue('test3', 'enabled', 'yes');
+
+        $apps = $manager->getIncompatibleApps('8.2.0');
+
+        $this->assertCount(2, $apps);
+        $this->assertEquals('test1', $apps[0]['id']);
+        $this->assertEquals('test3', $apps[1]['id']);
+    }
+
+    public function testGetEnabledAppsForGroup(): void {
+        $group = $this->createMock(IGroup::class);
+        $group->expects($this->any())
+            ->method('getGID')
+            ->willReturn('foo');
+
+        $this->appConfig->setValue('test1', 'enabled', 'yes');
+        $this->appConfig->setValue('test2', 'enabled', 'no');
+        $this->appConfig->setValue('test3', 'enabled', '["foo"]');
+        $this->appConfig->setValue('test4', 'enabled', '["asd"]');
+        $enabled = [
+            'cloud_federation_api',
+            'dav',
+            'federatedfilesharing',
+            'files',
+            'lookup_server_connector',
+            'oauth2',
+            'profile',
+            'provisioning_api',
+            'settings',
+            'test1',
+            'test3',
+            'theming',
+            'twofactor_backupcodes',
+            'viewer',
+            'workflowengine',
+        ];
+        $this->assertEquals($enabled, $this->manager->getEnabledAppsForGroup($group));
+    }
+
+    public function testGetAppRestriction(): void {
+        $this->appConfig->setValue('test1', 'enabled', 'yes');
+        $this->appConfig->setValue('test2', 'enabled', 'no');
+        $this->appConfig->setValue('test3', 'enabled', '["foo"]');
+
+        $this->assertEquals([], $this->manager->getAppRestriction('test1'));
+        $this->assertEquals([], $this->manager->getAppRestriction('test2'));
+        $this->assertEquals(['foo'], $this->manager->getAppRestriction('test3'));
+    }
+
+    public static function isBackendRequiredDataProvider(): array {
+        return [
+            // backend available
+            [
+                'caldav',
+                ['app1' => ['caldav']],
+                true,
+            ],
+            [
+                'caldav',
+                ['app1' => [], 'app2' => ['foo'], 'app3' => ['caldav']],
+                true,
+            ],
+            // backend not available
+            [
+                'caldav',
+                ['app3' => [], 'app1' => ['foo'], 'app2' => ['bar', 'baz']],
+                false,
+            ],
+            // no app available
+            [
+                'caldav',
+                [],
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider isBackendRequiredDataProvider
+     */
+    public function testIsBackendRequired(
+        string $backend,
+        array $appBackends,
+        bool $expected,
+    ): void {
+        $appInfoData = array_map(
+            static fn (array $backends) => ['dependencies' => ['backend' => $backends]],
+            $appBackends,
+        );
+
+        $reflection = new \ReflectionClass($this->manager);
+        $property = $reflection->getProperty('appInfos');
+        $property->setValue($this->manager, $appInfoData);
+
+        $this->assertEquals($expected, $this->manager->isBackendRequired($backend));
+    }
+
+    public function testGetAppVersion() {
+        $manager = $this->getMockBuilder(AppManager::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->config,
+                $this->groupManager,
+                $this->cacheFactory,
+                $this->eventDispatcher,
+                $this->logger,
+                $this->serverVersion,
+                $this->configManager,
+            ])
+            ->onlyMethods([
+                'getAppInfo',
+            ])
+            ->getMock();
+
+        $manager->expects(self::once())
+            ->method('getAppInfo')
+            ->with('myapp')
+            ->willReturn(['version' => '99.99.99-rc.99']);
+
+        $this->serverVersion
+            ->expects(self::never())
+            ->method('getVersionString');
+
+        $this->assertEquals(
+            '99.99.99-rc.99',
+            $manager->getAppVersion('myapp'),
+        );
+    }
+
+    public function testGetAppVersionCore() {
+        $manager = $this->getMockBuilder(AppManager::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->config,
+                $this->groupManager,
+                $this->cacheFactory,
+                $this->eventDispatcher,
+                $this->logger,
+                $this->serverVersion,
+                $this->configManager,
+            ])
+            ->onlyMethods([
+                'getAppInfo',
+            ])
+            ->getMock();
+
+        $manager->expects(self::never())
+            ->method('getAppInfo');
+
+        $this->serverVersion
+            ->expects(self::once())
+            ->method('getVersionString')
+            ->willReturn('1.2.3-beta.4');
+
+        $this->assertEquals(
+            '1.2.3-beta.4',
+            $manager->getAppVersion('core'),
+        );
+    }
+
+    public function testGetAppVersionUnknown() {
+        $manager = $this->getMockBuilder(AppManager::class)
+            ->setConstructorArgs([
+                $this->userSession,
+                $this->config,
+                $this->groupManager,
+                $this->cacheFactory,
+                $this->eventDispatcher,
+                $this->logger,
+                $this->serverVersion,
+                $this->configManager,
+            ])
+            ->onlyMethods([
+                'getAppInfo',
+            ])
+            ->getMock();
+
+        $manager->expects(self::once())
+            ->method('getAppInfo')
+            ->with('unknown')
+            ->willReturn(null);
+
+        $this->serverVersion
+            ->expects(self::never())
+            ->method('getVersionString');
+
+        $this->assertEquals(
+            '0',
+            $manager->getAppVersion('unknown'),
+        );
+    }
 
 }

tests/lib/DB/AdapterTest.php

Indentation +47 added lines, -47 removed lines

@@ -11,58 +11,58 @@
 use Test\TestCase;
 
 class AdapterTest extends TestCase {
-	private string $appId;
-	private $connection;
+    private string $appId;
+    private $connection;
 
-	public function setUp(): void {
-		$this->connection = Server::get(IDBConnection::class);
-		$this->appId = substr(uniqid('test_db_adapter', true), 0, 32);
-	}
+    public function setUp(): void {
+        $this->connection = Server::get(IDBConnection::class);
+        $this->appId = substr(uniqid('test_db_adapter', true), 0, 32);
+    }
 
-	public function tearDown(): void {
-		$qb = $this->connection->getQueryBuilder();
+    public function tearDown(): void {
+        $qb = $this->connection->getQueryBuilder();
 
-		$qb->delete('appconfig')
-			->from('appconfig')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($this->appId)))
-			->execute();
-	}
+        $qb->delete('appconfig')
+            ->from('appconfig')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($this->appId)))
+            ->execute();
+    }
 
-	public function testInsertIgnoreOnConflictDuplicate(): void {
-		$configKey = uniqid('key', true);
-		$expected = [
-			[
-				'configkey' => $configKey,
-				'configvalue' => '1',
-			]
-		];
-		$result = $this->connection->insertIgnoreConflict('appconfig', [
-			'appid' => $this->appId,
-			'configkey' => $configKey,
-			'configvalue' => '1',
-		]);
-		$this->assertEquals(1, $result);
-		$rows = $this->getRows($configKey);
-		$this->assertSame($expected, $rows);
+    public function testInsertIgnoreOnConflictDuplicate(): void {
+        $configKey = uniqid('key', true);
+        $expected = [
+            [
+                'configkey' => $configKey,
+                'configvalue' => '1',
+            ]
+        ];
+        $result = $this->connection->insertIgnoreConflict('appconfig', [
+            'appid' => $this->appId,
+            'configkey' => $configKey,
+            'configvalue' => '1',
+        ]);
+        $this->assertEquals(1, $result);
+        $rows = $this->getRows($configKey);
+        $this->assertSame($expected, $rows);
 
 
-		$result = $this->connection->insertIgnoreConflict('appconfig', [
-			'appid' => $this->appId,
-			'configkey' => $configKey,
-			'configvalue' => '2',
-		]);
-		$this->assertEquals(0, $result);
-		$rows = $this->getRows($configKey);
-		$this->assertSame($expected, $rows);
-	}
+        $result = $this->connection->insertIgnoreConflict('appconfig', [
+            'appid' => $this->appId,
+            'configkey' => $configKey,
+            'configvalue' => '2',
+        ]);
+        $this->assertEquals(0, $result);
+        $rows = $this->getRows($configKey);
+        $this->assertSame($expected, $rows);
+    }
 
-	private function getRows(string $configKey): array {
-		$qb = $this->connection->getQueryBuilder();
-		return $qb->select(['configkey', 'configvalue'])
-			->from('appconfig')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($this->appId)))
-			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($configKey)))
-			->execute()
-			->fetchAll();
-	}
+    private function getRows(string $configKey): array {
+        $qb = $this->connection->getQueryBuilder();
+        return $qb->select(['configkey', 'configvalue'])
+            ->from('appconfig')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($this->appId)))
+            ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($configKey)))
+            ->execute()
+            ->fetchAll();
+    }
 }