nextcloud / server

apps/files_sharing/lib/ExpireSharesJob.php

Indentation +47 added lines, -47 removed lines

@@ -20,60 +20,60 @@
  */
 class ExpireSharesJob extends TimedJob {
 
-	public function __construct(
-		ITimeFactory $time,
-		private IManager $shareManager,
-		private IDBConnection $db,
-	) {
-		parent::__construct($time);
+    public function __construct(
+        ITimeFactory $time,
+        private IManager $shareManager,
+        private IDBConnection $db,
+    ) {
+        parent::__construct($time);
 
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
 
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		//Current time
-		$now = new \DateTime();
-		$now = $now->format('Y-m-d H:i:s');
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        //Current time
+        $now = new \DateTime();
+        $now = $now->format('Y-m-d H:i:s');
 
-		/*
+        /*
 		 * Expire file link shares only (for now)
 		 */
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('id', 'share_type')
-			->from('share')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_LINK, IShare::TYPE_EMAIL], IQueryBuilder::PARAM_INT_ARRAY)),
-					$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
-					$qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY))
-				)
-			);
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('id', 'share_type')
+            ->from('share')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_LINK, IShare::TYPE_EMAIL], IQueryBuilder::PARAM_INT_ARRAY)),
+                    $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
+                    $qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY))
+                )
+            );
 
-		$shares = $qb->executeQuery();
-		while ($share = $shares->fetchAssociative()) {
-			if ((int)$share['share_type'] === IShare::TYPE_LINK) {
-				$id = 'ocinternal';
-			} elseif ((int)$share['share_type'] === IShare::TYPE_EMAIL) {
-				$id = 'ocMailShare';
-			}
+        $shares = $qb->executeQuery();
+        while ($share = $shares->fetchAssociative()) {
+            if ((int)$share['share_type'] === IShare::TYPE_LINK) {
+                $id = 'ocinternal';
+            } elseif ((int)$share['share_type'] === IShare::TYPE_EMAIL) {
+                $id = 'ocMailShare';
+            }
 
-			$id .= ':' . $share['id'];
+            $id .= ':' . $share['id'];
 
-			try {
-				$share = $this->shareManager->getShareById($id);
-				$this->shareManager->deleteShare($share);
-			} catch (ShareNotFound $e) {
-				// Normally the share gets automatically expired on fetching it
-			}
-		}
-		$shares->closeCursor();
-	}
+            try {
+                $share = $this->shareManager->getShareById($id);
+                $this->shareManager->deleteShare($share);
+            } catch (ShareNotFound $e) {
+                // Normally the share gets automatically expired on fetching it
+            }
+        }
+        $shares->closeCursor();
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -59,13 +59,13 @@
 
 		$shares = $qb->executeQuery();
 		while ($share = $shares->fetchAssociative()) {
-			if ((int)$share['share_type'] === IShare::TYPE_LINK) {
+			if ((int) $share['share_type'] === IShare::TYPE_LINK) {
 				$id = 'ocinternal';
-			} elseif ((int)$share['share_type'] === IShare::TYPE_EMAIL) {
+			} elseif ((int) $share['share_type'] === IShare::TYPE_EMAIL) {
 				$id = 'ocMailShare';
 			}
 
-			$id .= ':' . $share['id'];
+			$id .= ':'.$share['id'];
 
 			try {
 				$share = $this->shareManager->getShareById($id);

apps/files_sharing/lib/ShareBackend/File.php

Indentation +206 added lines, -206 removed lines

@@ -19,210 +19,210 @@
 use Psr\Log\LoggerInterface;
 
 class File implements Share_Backend_File_Dependent {
-	public const FORMAT_SHARED_STORAGE = 0;
-	public const FORMAT_GET_FOLDER_CONTENTS = 1;
-	public const FORMAT_FILE_APP_ROOT = 2;
-	public const FORMAT_OPENDIR = 3;
-	public const FORMAT_GET_ALL = 4;
-	public const FORMAT_PERMISSIONS = 5;
-	public const FORMAT_TARGET_NAMES = 6;
-
-	private $path;
-
-	public function __construct(
-		private ?FederatedShareProvider $federatedShareProvider = null,
-	) {
-		if ($federatedShareProvider) {
-			$this->federatedShareProvider = $federatedShareProvider;
-		} else {
-			$this->federatedShareProvider = Server::get(FederatedShareProvider::class);
-		}
-	}
-
-	public function isValidSource($itemSource, $uidOwner) {
-		try {
-			$path = Filesystem::getPath($itemSource);
-			// FIXME: attributes should not be set here,
-			// keeping this pattern for now to avoid unexpected
-			// regressions
-			$this->path = Filesystem::normalizePath(basename($path));
-			return true;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function getFilePath($itemSource, $uidOwner) {
-		if (isset($this->path)) {
-			$path = $this->path;
-			$this->path = null;
-			return $path;
-		} else {
-			try {
-				$path = Filesystem::getPath($itemSource);
-				return $path;
-			} catch (NotFoundException $e) {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * create unique target
-	 *
-	 * @param string $itemSource
-	 * @param string $shareWith
-	 * @return string
-	 */
-	public function generateTarget($itemSource, $shareWith) {
-		$shareFolder = Helper::getShareFolder();
-		$target = Filesystem::normalizePath($shareFolder . '/' . basename($itemSource));
-
-		Filesystem::initMountPoints($shareWith);
-		$view = new View('/' . $shareWith . '/files');
-
-		if (!$view->is_dir($shareFolder)) {
-			$dir = '';
-			$subdirs = explode('/', $shareFolder);
-			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
-				if (!$view->is_dir($dir)) {
-					$view->mkdir($dir);
-				}
-			}
-		}
-
-		return Helper::generateUniqueTarget($target, $view);
-	}
-
-	public function formatItems($items, $format, $parameters = null) {
-		if ($format === self::FORMAT_SHARED_STORAGE) {
-			// Only 1 item should come through for this format call
-			$item = array_shift($items);
-			return [
-				'parent' => $item['parent'],
-				'path' => $item['path'],
-				'storage' => $item['storage'],
-				'permissions' => $item['permissions'],
-				'uid_owner' => $item['uid_owner'],
-			];
-		} elseif ($format === self::FORMAT_GET_FOLDER_CONTENTS) {
-			$files = [];
-			foreach ($items as $item) {
-				$file = [];
-				$file['fileid'] = $item['file_source'];
-				$file['storage'] = $item['storage'];
-				$file['path'] = $item['file_target'];
-				$file['parent'] = $item['file_parent'];
-				$file['name'] = basename($item['file_target']);
-				$file['mimetype'] = $item['mimetype'];
-				$file['mimepart'] = $item['mimepart'];
-				$file['mtime'] = $item['mtime'];
-				$file['encrypted'] = $item['encrypted'];
-				$file['etag'] = $item['etag'];
-				$file['uid_owner'] = $item['uid_owner'];
-				$file['displayname_owner'] = $item['displayname_owner'];
-
-				$storage = Filesystem::getStorage('/');
-				$cache = $storage->getCache();
-				$file['size'] = $item['size'];
-				$files[] = $file;
-			}
-			return $files;
-		} elseif ($format === self::FORMAT_OPENDIR) {
-			$files = [];
-			foreach ($items as $item) {
-				$files[] = basename($item['file_target']);
-			}
-			return $files;
-		} elseif ($format === self::FORMAT_GET_ALL) {
-			$ids = [];
-			foreach ($items as $item) {
-				$ids[] = $item['file_source'];
-			}
-			return $ids;
-		} elseif ($format === self::FORMAT_PERMISSIONS) {
-			$filePermissions = [];
-			foreach ($items as $item) {
-				$filePermissions[$item['file_source']] = $item['permissions'];
-			}
-			return $filePermissions;
-		} elseif ($format === self::FORMAT_TARGET_NAMES) {
-			$targets = [];
-			foreach ($items as $item) {
-				$targets[] = $item['file_target'];
-			}
-			return $targets;
-		}
-		return [];
-	}
-
-	/**
-	 * check if server2server share is enabled
-	 *
-	 * @param int $shareType
-	 * @return boolean
-	 */
-	public function isShareTypeAllowed($shareType) {
-		if ($shareType === IShare::TYPE_REMOTE) {
-			return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		}
-
-		if ($shareType === IShare::TYPE_REMOTE_GROUP) {
-			return $this->federatedShareProvider->isOutgoingServer2serverGroupShareEnabled();
-		}
-
-		return true;
-	}
-
-	/**
-	 * resolve reshares to return the correct source item
-	 * @param array $source
-	 * @return array source item
-	 */
-	protected static function resolveReshares($source) {
-		if (isset($source['parent'])) {
-			$parent = $source['parent'];
-			while (isset($parent)) {
-				$qb = Server::get(IDBConnection::class)->getQueryBuilder();
-				$qb->select('parent', 'uid_owner')
-					->from('share')
-					->where(
-						$qb->expr()->eq('id', $qb->createNamedParameter($parent))
-					);
-				$result = $qb->executeQuery();
-				$item = $result->fetchAssociative();
-				$result->closeCursor();
-				if (isset($item['parent'])) {
-					$parent = $item['parent'];
-				} else {
-					$fileOwner = $item['uid_owner'];
-					break;
-				}
-			}
-		} else {
-			$fileOwner = $source['uid_owner'];
-		}
-		if (isset($fileOwner)) {
-			$source['fileOwner'] = $fileOwner;
-		} else {
-			Server::get(LoggerInterface::class)->error('No owner found for reshare', ['app' => 'files_sharing']);
-		}
-
-		return $source;
-	}
-
-	/**
-	 * @param string $target
-	 * @param array $share
-	 * @return array|false source item
-	 */
-	public static function getSource($target, $share) {
-		if ($share['item_type'] === 'folder' && $target !== '') {
-			// note: in case of ext storage mount points the path might be empty
-			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
-		}
-		return self::resolveReshares($share);
-	}
+    public const FORMAT_SHARED_STORAGE = 0;
+    public const FORMAT_GET_FOLDER_CONTENTS = 1;
+    public const FORMAT_FILE_APP_ROOT = 2;
+    public const FORMAT_OPENDIR = 3;
+    public const FORMAT_GET_ALL = 4;
+    public const FORMAT_PERMISSIONS = 5;
+    public const FORMAT_TARGET_NAMES = 6;
+
+    private $path;
+
+    public function __construct(
+        private ?FederatedShareProvider $federatedShareProvider = null,
+    ) {
+        if ($federatedShareProvider) {
+            $this->federatedShareProvider = $federatedShareProvider;
+        } else {
+            $this->federatedShareProvider = Server::get(FederatedShareProvider::class);
+        }
+    }
+
+    public function isValidSource($itemSource, $uidOwner) {
+        try {
+            $path = Filesystem::getPath($itemSource);
+            // FIXME: attributes should not be set here,
+            // keeping this pattern for now to avoid unexpected
+            // regressions
+            $this->path = Filesystem::normalizePath(basename($path));
+            return true;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function getFilePath($itemSource, $uidOwner) {
+        if (isset($this->path)) {
+            $path = $this->path;
+            $this->path = null;
+            return $path;
+        } else {
+            try {
+                $path = Filesystem::getPath($itemSource);
+                return $path;
+            } catch (NotFoundException $e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * create unique target
+     *
+     * @param string $itemSource
+     * @param string $shareWith
+     * @return string
+     */
+    public function generateTarget($itemSource, $shareWith) {
+        $shareFolder = Helper::getShareFolder();
+        $target = Filesystem::normalizePath($shareFolder . '/' . basename($itemSource));
+
+        Filesystem::initMountPoints($shareWith);
+        $view = new View('/' . $shareWith . '/files');
+
+        if (!$view->is_dir($shareFolder)) {
+            $dir = '';
+            $subdirs = explode('/', $shareFolder);
+            foreach ($subdirs as $subdir) {
+                $dir = $dir . '/' . $subdir;
+                if (!$view->is_dir($dir)) {
+                    $view->mkdir($dir);
+                }
+            }
+        }
+
+        return Helper::generateUniqueTarget($target, $view);
+    }
+
+    public function formatItems($items, $format, $parameters = null) {
+        if ($format === self::FORMAT_SHARED_STORAGE) {
+            // Only 1 item should come through for this format call
+            $item = array_shift($items);
+            return [
+                'parent' => $item['parent'],
+                'path' => $item['path'],
+                'storage' => $item['storage'],
+                'permissions' => $item['permissions'],
+                'uid_owner' => $item['uid_owner'],
+            ];
+        } elseif ($format === self::FORMAT_GET_FOLDER_CONTENTS) {
+            $files = [];
+            foreach ($items as $item) {
+                $file = [];
+                $file['fileid'] = $item['file_source'];
+                $file['storage'] = $item['storage'];
+                $file['path'] = $item['file_target'];
+                $file['parent'] = $item['file_parent'];
+                $file['name'] = basename($item['file_target']);
+                $file['mimetype'] = $item['mimetype'];
+                $file['mimepart'] = $item['mimepart'];
+                $file['mtime'] = $item['mtime'];
+                $file['encrypted'] = $item['encrypted'];
+                $file['etag'] = $item['etag'];
+                $file['uid_owner'] = $item['uid_owner'];
+                $file['displayname_owner'] = $item['displayname_owner'];
+
+                $storage = Filesystem::getStorage('/');
+                $cache = $storage->getCache();
+                $file['size'] = $item['size'];
+                $files[] = $file;
+            }
+            return $files;
+        } elseif ($format === self::FORMAT_OPENDIR) {
+            $files = [];
+            foreach ($items as $item) {
+                $files[] = basename($item['file_target']);
+            }
+            return $files;
+        } elseif ($format === self::FORMAT_GET_ALL) {
+            $ids = [];
+            foreach ($items as $item) {
+                $ids[] = $item['file_source'];
+            }
+            return $ids;
+        } elseif ($format === self::FORMAT_PERMISSIONS) {
+            $filePermissions = [];
+            foreach ($items as $item) {
+                $filePermissions[$item['file_source']] = $item['permissions'];
+            }
+            return $filePermissions;
+        } elseif ($format === self::FORMAT_TARGET_NAMES) {
+            $targets = [];
+            foreach ($items as $item) {
+                $targets[] = $item['file_target'];
+            }
+            return $targets;
+        }
+        return [];
+    }
+
+    /**
+     * check if server2server share is enabled
+     *
+     * @param int $shareType
+     * @return boolean
+     */
+    public function isShareTypeAllowed($shareType) {
+        if ($shareType === IShare::TYPE_REMOTE) {
+            return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        }
+
+        if ($shareType === IShare::TYPE_REMOTE_GROUP) {
+            return $this->federatedShareProvider->isOutgoingServer2serverGroupShareEnabled();
+        }
+
+        return true;
+    }
+
+    /**
+     * resolve reshares to return the correct source item
+     * @param array $source
+     * @return array source item
+     */
+    protected static function resolveReshares($source) {
+        if (isset($source['parent'])) {
+            $parent = $source['parent'];
+            while (isset($parent)) {
+                $qb = Server::get(IDBConnection::class)->getQueryBuilder();
+                $qb->select('parent', 'uid_owner')
+                    ->from('share')
+                    ->where(
+                        $qb->expr()->eq('id', $qb->createNamedParameter($parent))
+                    );
+                $result = $qb->executeQuery();
+                $item = $result->fetchAssociative();
+                $result->closeCursor();
+                if (isset($item['parent'])) {
+                    $parent = $item['parent'];
+                } else {
+                    $fileOwner = $item['uid_owner'];
+                    break;
+                }
+            }
+        } else {
+            $fileOwner = $source['uid_owner'];
+        }
+        if (isset($fileOwner)) {
+            $source['fileOwner'] = $fileOwner;
+        } else {
+            Server::get(LoggerInterface::class)->error('No owner found for reshare', ['app' => 'files_sharing']);
+        }
+
+        return $source;
+    }
+
+    /**
+     * @param string $target
+     * @param array $share
+     * @return array|false source item
+     */
+    public static function getSource($target, $share) {
+        if ($share['item_type'] === 'folder' && $target !== '') {
+            // note: in case of ext storage mount points the path might be empty
+            // which would cause a leading slash to appear
+            $share['path'] = ltrim($share['path'] . '/' . $target, '/');
+        }
+        return self::resolveReshares($share);
+    }
 }

apps/files_sharing/lib/ShareBackend/Folder.php

Indentation +46 added lines, -46 removed lines

@@ -12,50 +12,50 @@
 use OCP\Share_Backend_Collection;
 
 class Folder extends File implements Share_Backend_Collection {
-	public function getChildren($itemSource): array {
-		$children = [];
-		$parents = [$itemSource];
-
-		$qb = Server::get(IDBConnection::class)->getQueryBuilder();
-		$qb->select('id')
-			->from('mimetypes')
-			->where(
-				$qb->expr()->eq('mimetype', $qb->createNamedParameter('httpd/unix-directory'))
-			);
-		$result = $qb->executeQuery();
-
-		if (($row = $result->fetchAssociative()) !== false) {
-			$mimetype = (int)$row['id'];
-		} else {
-			$mimetype = -1;
-		}
-		$result->closeCursor();
-
-		while (!empty($parents)) {
-			$qb = Server::get(IDBConnection::class)->getQueryBuilder();
-
-			$parents = array_map(function ($parent) use ($qb) {
-				return $qb->createNamedParameter($parent);
-			}, $parents);
-
-			$qb->select('`fileid', 'name', '`mimetype')
-				->from('filecache')
-				->where(
-					$qb->expr()->in('parent', $parents)
-				);
-
-			$result = $qb->executeQuery();
-
-			$parents = [];
-			foreach ($result->iterateAssociative() as $file) {
-				$children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
-				// If a child folder is found look inside it
-				if ((int)$file['mimetype'] === $mimetype) {
-					$parents[] = $file['fileid'];
-				}
-			}
-			$result->closeCursor();
-		}
-		return $children;
-	}
+    public function getChildren($itemSource): array {
+        $children = [];
+        $parents = [$itemSource];
+
+        $qb = Server::get(IDBConnection::class)->getQueryBuilder();
+        $qb->select('id')
+            ->from('mimetypes')
+            ->where(
+                $qb->expr()->eq('mimetype', $qb->createNamedParameter('httpd/unix-directory'))
+            );
+        $result = $qb->executeQuery();
+
+        if (($row = $result->fetchAssociative()) !== false) {
+            $mimetype = (int)$row['id'];
+        } else {
+            $mimetype = -1;
+        }
+        $result->closeCursor();
+
+        while (!empty($parents)) {
+            $qb = Server::get(IDBConnection::class)->getQueryBuilder();
+
+            $parents = array_map(function ($parent) use ($qb) {
+                return $qb->createNamedParameter($parent);
+            }, $parents);
+
+            $qb->select('`fileid', 'name', '`mimetype')
+                ->from('filecache')
+                ->where(
+                    $qb->expr()->in('parent', $parents)
+                );
+
+            $result = $qb->executeQuery();
+
+            $parents = [];
+            foreach ($result->iterateAssociative() as $file) {
+                $children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
+                // If a child folder is found look inside it
+                if ((int)$file['mimetype'] === $mimetype) {
+                    $parents[] = $file['fileid'];
+                }
+            }
+            $result->closeCursor();
+        }
+        return $children;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 		$result = $qb->executeQuery();
 
 		if (($row = $result->fetchAssociative()) !== false) {
-			$mimetype = (int)$row['id'];
+			$mimetype = (int) $row['id'];
 		} else {
 			$mimetype = -1;
 		}
@@ -34,7 +34,7 @@ 
 		while (!empty($parents)) {
 			$qb = Server::get(IDBConnection::class)->getQueryBuilder();
 
-			$parents = array_map(function ($parent) use ($qb) {
+			$parents = array_map(function($parent) use ($qb) {
 				return $qb->createNamedParameter($parent);
 			}, $parents);
 
@@ -50,7 +50,7 @@ 
 			foreach ($result->iterateAssociative() as $file) {
 				$children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
 				// If a child folder is found look inside it
-				if ((int)$file['mimetype'] === $mimetype) {
+				if ((int) $file['mimetype'] === $mimetype) {
 					$parents[] = $file['fileid'];
 				}
 			}

lib/private/DB/ArrayResult.php

Indentation +116 added lines, -116 removed lines

@@ -16,120 +16,120 @@
  * Wrap an array or rows into a result interface
  */
 class ArrayResult implements IResult {
-	protected int $count;
-
-	public function __construct(
-		/** @var array<string, mixed> $rows */
-		protected array $rows,
-	) {
-		$this->count = count($this->rows);
-	}
-
-	#[Override]
-	public function closeCursor(): bool {
-		// noop
-		return true;
-	}
-
-	#[Override]
-	public function fetch(int $fetchMode = PDO::FETCH_ASSOC) {
-		$row = array_shift($this->rows);
-		if (!$row) {
-			return false;
-		}
-		return match ($fetchMode) {
-			PDO::FETCH_ASSOC => $row,
-			PDO::FETCH_NUM => array_values($row),
-			PDO::FETCH_COLUMN => current($row),
-			default => throw new \InvalidArgumentException('Fetch mode not supported for array result'),
-		};
-
-	}
-
-	#[Override]
-	public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array {
-		return match ($fetchMode) {
-			PDO::FETCH_ASSOC => $this->rows,
-			PDO::FETCH_NUM => array_map(static fn (array $row): array => array_values($row), $this->rows),
-			PDO::FETCH_COLUMN => array_map(static fn (array $row): mixed => current($row), $this->rows),
-			default => throw new \InvalidArgumentException('Fetch mode not supported for array result'),
-		};
-	}
-
-	#[Override]
-	public function fetchColumn() {
-		return $this->fetchOne();
-	}
-
-	#[Override]
-	public function fetchOne() {
-		$row = $this->fetch();
-		if ($row) {
-			return current($row);
-		} else {
-			return false;
-		}
-	}
-
-	#[Override]
-	public function fetchAssociative(): array|false {
-		$row = $this->fetch();
-		if ($row) {
-			/** @var array<string, mixed> $row */
-			return $row;
-		} else {
-			return false;
-		}
-	}
-
-	#[Override]
-	public function fetchNumeric(): array|false {
-		$row = $this->fetch(PDO::FETCH_NUM);
-		if ($row) {
-			/** @var list<mixed> $row */
-			return $row;
-		} else {
-			return false;
-		}
-	}
-
-	#[Override]
-	public function fetchAllNumeric(): array {
-		/** @var list<list<mixed>> $result */
-		$result = $this->fetchAll(PDO::FETCH_NUM);
-		return $result;
-	}
-
-	#[Override]
-	public function fetchAllAssociative(): array {
-		/** @var list<array<string,mixed>> $result */
-		$result = $this->fetchAll();
-		return $result;
-	}
-
-	#[Override]
-	public function fetchFirstColumn(): array {
-		/** @var list<mixed> $result */
-		$result = $this->fetchAll(PDO::FETCH_COLUMN);
-		return $result;
-	}
-
-	#[Override]
-	public function rowCount(): int {
-		return $this->count;
-	}
-
-	#[Override]
-	public function iterateNumeric(): \Traversable {
-		while (($row = $this->fetchNumeric()) !== false) {
-			yield $row;
-		}
-	}
-
-	#[Override]
-	public function iterateAssociative(): \Traversable {
-		while (($row = $this->fetchAssociative()) !== false) {
-			yield $row;
-		}
-	}
+    protected int $count;
+
+    public function __construct(
+        /** @var array<string, mixed> $rows */
+        protected array $rows,
+    ) {
+        $this->count = count($this->rows);
+    }
+
+    #[Override]
+    public function closeCursor(): bool {
+        // noop
+        return true;
+    }
+
+    #[Override]
+    public function fetch(int $fetchMode = PDO::FETCH_ASSOC) {
+        $row = array_shift($this->rows);
+        if (!$row) {
+            return false;
+        }
+        return match ($fetchMode) {
+            PDO::FETCH_ASSOC => $row,
+            PDO::FETCH_NUM => array_values($row),
+            PDO::FETCH_COLUMN => current($row),
+            default => throw new \InvalidArgumentException('Fetch mode not supported for array result'),
+        };
+
+    }
+
+    #[Override]
+    public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array {
+        return match ($fetchMode) {
+            PDO::FETCH_ASSOC => $this->rows,
+            PDO::FETCH_NUM => array_map(static fn (array $row): array => array_values($row), $this->rows),
+            PDO::FETCH_COLUMN => array_map(static fn (array $row): mixed => current($row), $this->rows),
+            default => throw new \InvalidArgumentException('Fetch mode not supported for array result'),
+        };
+    }
+
+    #[Override]
+    public function fetchColumn() {
+        return $this->fetchOne();
+    }
+
+    #[Override]
+    public function fetchOne() {
+        $row = $this->fetch();
+        if ($row) {
+            return current($row);
+        } else {
+            return false;
+        }
+    }
+
+    #[Override]
+    public function fetchAssociative(): array|false {
+        $row = $this->fetch();
+        if ($row) {
+            /** @var array<string, mixed> $row */
+            return $row;
+        } else {
+            return false;
+        }
+    }
+
+    #[Override]
+    public function fetchNumeric(): array|false {
+        $row = $this->fetch(PDO::FETCH_NUM);
+        if ($row) {
+            /** @var list<mixed> $row */
+            return $row;
+        } else {
+            return false;
+        }
+    }
+
+    #[Override]
+    public function fetchAllNumeric(): array {
+        /** @var list<list<mixed>> $result */
+        $result = $this->fetchAll(PDO::FETCH_NUM);
+        return $result;
+    }
+
+    #[Override]
+    public function fetchAllAssociative(): array {
+        /** @var list<array<string,mixed>> $result */
+        $result = $this->fetchAll();
+        return $result;
+    }
+
+    #[Override]
+    public function fetchFirstColumn(): array {
+        /** @var list<mixed> $result */
+        $result = $this->fetchAll(PDO::FETCH_COLUMN);
+        return $result;
+    }
+
+    #[Override]
+    public function rowCount(): int {
+        return $this->count;
+    }
+
+    #[Override]
+    public function iterateNumeric(): \Traversable {
+        while (($row = $this->fetchNumeric()) !== false) {
+            yield $row;
+        }
+    }
+
+    #[Override]
+    public function iterateAssociative(): \Traversable {
+        while (($row = $this->fetchAssociative()) !== false) {
+            yield $row;
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 	}
 
 	#[Override]
-	public function fetchAssociative(): array|false {
+	public function fetchAssociative(): array | false {
 		$row = $this->fetch();
 		if ($row) {
 			/** @var array<string, mixed> $row */
@@ -83,7 +83,7 @@ 
 	}
 
 	#[Override]
-	public function fetchNumeric(): array|false {
+	public function fetchNumeric(): array | false {
 		$row = $this->fetch(PDO::FETCH_NUM);
 		if ($row) {
 			/** @var list<mixed> $row */

lib/private/DB/ResultAdapter.php

Indentation +81 added lines, -81 removed lines

@@ -17,85 +17,85 @@
  * Adapts DBAL 2.6 API for DBAL 3.x for backwards compatibility of a leaked type
  */
 class ResultAdapter implements IResult {
-	public function __construct(
-		private readonly Result $inner,
-	) {
-	}
-
-	#[Override]
-	public function closeCursor(): bool {
-		$this->inner->free();
-
-		return true;
-	}
-
-	#[Override]
-	public function fetch(int $fetchMode = PDO::FETCH_ASSOC) {
-		return match ($fetchMode) {
-			PDO::FETCH_ASSOC => $this->inner->fetchAssociative(),
-			PDO::FETCH_NUM => $this->inner->fetchNumeric(),
-			PDO::FETCH_COLUMN => $this->inner->fetchOne(),
-			default => throw new \Exception('Fetch mode needs to be assoc, num or column.'),
-		};
-	}
-
-	#[Override]
-	public function fetchAssociative(): array|false {
-		return $this->inner->fetchAssociative();
-	}
-
-	#[Override]
-	public function fetchNumeric(): array|false {
-		return $this->inner->fetchNumeric();
-	}
-
-	#[Override]
-	public function fetchOne(): mixed {
-		return $this->inner->fetchOne();
-	}
-
-	#[Override]
-	public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array {
-		return match ($fetchMode) {
-			PDO::FETCH_ASSOC => $this->inner->fetchAllAssociative(),
-			PDO::FETCH_NUM => $this->inner->fetchAllNumeric(),
-			PDO::FETCH_COLUMN => $this->inner->fetchFirstColumn(),
-			default => throw new \Exception('Fetch mode needs to be assoc, num or column.'),
-		};
-	}
-
-	#[Override]
-	public function fetchColumn($columnIndex = 0) {
-		return $this->inner->fetchOne();
-	}
-
-	#[Override]
-	public function rowCount(): int {
-		return $this->inner->rowCount();
-	}
-
-	#[Override]
-	public function fetchAllAssociative(): array {
-		return $this->inner->fetchAllAssociative();
-	}
-
-	#[Override]
-	public function fetchAllNumeric(): array {
-		return $this->inner->fetchAllNumeric();
-	}
-
-	#[Override]
-	public function fetchFirstColumn(): array {
-		return $this->inner->fetchFirstColumn();
-	}
-
-	#[Override]
-	public function iterateNumeric(): \Traversable {
-		yield from $this->inner->iterateNumeric();
-	}
-
-	#[Override]
-	public function iterateAssociative(): \Traversable {
-		yield from $this->inner->iterateAssociative();
-	}
+    public function __construct(
+        private readonly Result $inner,
+    ) {
+    }
+
+    #[Override]
+    public function closeCursor(): bool {
+        $this->inner->free();
+
+        return true;
+    }
+
+    #[Override]
+    public function fetch(int $fetchMode = PDO::FETCH_ASSOC) {
+        return match ($fetchMode) {
+            PDO::FETCH_ASSOC => $this->inner->fetchAssociative(),
+            PDO::FETCH_NUM => $this->inner->fetchNumeric(),
+            PDO::FETCH_COLUMN => $this->inner->fetchOne(),
+            default => throw new \Exception('Fetch mode needs to be assoc, num or column.'),
+        };
+    }
+
+    #[Override]
+    public function fetchAssociative(): array|false {
+        return $this->inner->fetchAssociative();
+    }
+
+    #[Override]
+    public function fetchNumeric(): array|false {
+        return $this->inner->fetchNumeric();
+    }
+
+    #[Override]
+    public function fetchOne(): mixed {
+        return $this->inner->fetchOne();
+    }
+
+    #[Override]
+    public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array {
+        return match ($fetchMode) {
+            PDO::FETCH_ASSOC => $this->inner->fetchAllAssociative(),
+            PDO::FETCH_NUM => $this->inner->fetchAllNumeric(),
+            PDO::FETCH_COLUMN => $this->inner->fetchFirstColumn(),
+            default => throw new \Exception('Fetch mode needs to be assoc, num or column.'),
+        };
+    }
+
+    #[Override]
+    public function fetchColumn($columnIndex = 0) {
+        return $this->inner->fetchOne();
+    }
+
+    #[Override]
+    public function rowCount(): int {
+        return $this->inner->rowCount();
+    }
+
+    #[Override]
+    public function fetchAllAssociative(): array {
+        return $this->inner->fetchAllAssociative();
+    }
+
+    #[Override]
+    public function fetchAllNumeric(): array {
+        return $this->inner->fetchAllNumeric();
+    }
+
+    #[Override]
+    public function fetchFirstColumn(): array {
+        return $this->inner->fetchFirstColumn();
+    }
+
+    #[Override]
+    public function iterateNumeric(): \Traversable {
+        yield from $this->inner->iterateNumeric();
+    }
+
+    #[Override]
+    public function iterateAssociative(): \Traversable {
+        yield from $this->inner->iterateAssociative();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -40,12 +40,12 @@
 	}
 
 	#[Override]
-	public function fetchAssociative(): array|false {
+	public function fetchAssociative(): array | false {
 		return $this->inner->fetchAssociative();
 	}
 
 	#[Override]
-	public function fetchNumeric(): array|false {
+	public function fetchNumeric(): array | false {
 		return $this->inner->fetchNumeric();
 	}
 

lib/private/Preview/BackgroundCleanupJob.php

Indentation +64 added lines, -64 removed lines

@@ -20,42 +20,42 @@ 
  */
 class BackgroundCleanupJob extends TimedJob {
 
-	public function __construct(
-		ITimeFactory $timeFactory,
-		private readonly IDBConnection $connection,
-		private readonly PreviewService $previewService,
-		private readonly bool $isCLI,
-	) {
-		parent::__construct($timeFactory);
-		// Run at most once an hour
-		$this->setInterval(60 * 60);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
+    public function __construct(
+        ITimeFactory $timeFactory,
+        private readonly IDBConnection $connection,
+        private readonly PreviewService $previewService,
+        private readonly bool $isCLI,
+    ) {
+        parent::__construct($timeFactory);
+        // Run at most once an hour
+        $this->setInterval(60 * 60);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
 
-	public function run($argument): void {
-		foreach ($this->getDeletedFiles() as $fileId) {
-			$previewIds = [];
-			foreach ($this->previewService->getAvailablePreviewsForFile($fileId) as $preview) {
-				$this->previewService->deletePreview($preview);
-			}
-		}
-	}
+    public function run($argument): void {
+        foreach ($this->getDeletedFiles() as $fileId) {
+            $previewIds = [];
+            foreach ($this->previewService->getAvailablePreviewsForFile($fileId) as $preview) {
+                $this->previewService->deletePreview($preview);
+            }
+        }
+    }
 
-	/**
-	 * @return \Iterator<FileId>
-	 */
-	private function getDeletedFiles(): \Iterator {
-		if ($this->connection->getShardDefinition('filecache')) {
-			foreach ($this->previewService->getAvailableFileIds() as $availableFileIdGroup) {
-				$fileIds = $this->findMissingSources($availableFileIdGroup['storageId'], $availableFileIdGroup['fileIds']);
-				foreach ($fileIds as $fileId) {
-					yield $fileId;
-				}
-			}
-			return;
-		}
+    /**
+     * @return \Iterator<FileId>
+     */
+    private function getDeletedFiles(): \Iterator {
+        if ($this->connection->getShardDefinition('filecache')) {
+            foreach ($this->previewService->getAvailableFileIds() as $availableFileIdGroup) {
+                $fileIds = $this->findMissingSources($availableFileIdGroup['storageId'], $availableFileIdGroup['fileIds']);
+                foreach ($fileIds as $fileId) {
+                    yield $fileId;
+                }
+            }
+            return;
+        }
 
-		/*
+        /*
 		 * Deleting a file will not delete related previews right away.
 		 *
 		 * A delete request is usually an HTTP request.
@@ -70,38 +70,38 @@ 
 		 *
 		 * If the related file is deleted, b.fileid will be null and the preview folder can be deleted.
 		 */
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('p.file_id')
-			->from('previews', 'p')
-			->leftJoin('p', 'filecache', 'f', $qb->expr()->eq(
-				'p.file_id', 'f.fileid'
-			))
-			->where($qb->expr()->isNull('f.fileid'));
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('p.file_id')
+            ->from('previews', 'p')
+            ->leftJoin('p', 'filecache', 'f', $qb->expr()->eq(
+                'p.file_id', 'f.fileid'
+            ))
+            ->where($qb->expr()->isNull('f.fileid'));
 
-		if (!$this->isCLI) {
-			$qb->setMaxResults(10);
-		}
+        if (!$this->isCLI) {
+            $qb->setMaxResults(10);
+        }
 
-		$cursor = $qb->executeQuery();
-		while ($row = $cursor->fetch()) {
-			yield (int)$row['file_id'];
-		}
-		$cursor->closeCursor();
-	}
+        $cursor = $qb->executeQuery();
+        while ($row = $cursor->fetch()) {
+            yield (int)$row['file_id'];
+        }
+        $cursor->closeCursor();
+    }
 
-	/**
-	 * @param FileId[] $ids
-	 * @return FileId[]
-	 */
-	private function findMissingSources(int $storage, array $ids): array {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('fileid')
-			->from('filecache')
-			->where($qb->expr()->andX(
-				$qb->expr()->in('fileid', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)),
-				$qb->expr()->eq('storage', $qb->createNamedParameter($storage, IQueryBuilder::PARAM_INT)),
-			));
-		$found = $qb->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
-		return array_diff($ids, $found);
-	}
+    /**
+     * @param FileId[] $ids
+     * @return FileId[]
+     */
+    private function findMissingSources(int $storage, array $ids): array {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('fileid')
+            ->from('filecache')
+            ->where($qb->expr()->andX(
+                $qb->expr()->in('fileid', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)),
+                $qb->expr()->eq('storage', $qb->createNamedParameter($storage, IQueryBuilder::PARAM_INT)),
+            ));
+        $found = $qb->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
+        return array_diff($ids, $found);
+    }
 }

lib/private/Preview/Storage/ObjectStorePreviewStorage.php

Indentation +157 added lines, -157 removed lines

@@ -26,161 +26,161 @@
  */
 class ObjectStorePreviewStorage implements IPreviewStorage {
 
-	/**
-	 * @var array<string, array<string, IObjectStore>>
-	 */
-	private array $objectStoreCache = [];
-
-	private bool $isMultibucketPreviewDistributionEnabled;
-
-	public function __construct(
-		private readonly PrimaryObjectStoreConfig $objectStoreConfig,
-		IConfig $config,
-		private readonly PreviewMapper $previewMapper,
-	) {
-		$this->isMultibucketPreviewDistributionEnabled = $config->getSystemValueBool('objectstore.multibucket.preview-distribution');
-	}
-
-	#[Override]
-	public function writePreview(Preview $preview, mixed $stream): int {
-		$size = 0;
-		$countStream = CountWrapper::wrap($stream, function (int $writtenSize) use (&$size): void {
-			$size = $writtenSize;
-		});
-
-		[
-			'urn' => $urn,
-			'store' => $store,
-		] = $this->getObjectStoreInfoForNewPreview($preview);
-
-		try {
-			$store->writeObject($urn, $countStream);
-		} catch (\Exception $exception) {
-			throw new NotPermittedException('Unable to save preview to object store', previous: $exception);
-		}
-		return $size;
-	}
-
-	#[Override]
-	public function readPreview(Preview $preview): mixed {
-		[
-			'urn' => $urn,
-			'store' => $store,
-		] = $this->getObjectStoreInfoForExistingPreview($preview);
-
-		try {
-			return $store->readObject($urn);
-		} catch (\Exception $exception) {
-			throw new NotPermittedException('Unable to read preview from object store with urn:' . $urn, previous: $exception);
-		}
-	}
-
-	#[Override]
-	public function deletePreview(Preview $preview): void {
-		if (defined('PHPUNIT_RUN') && $preview->getLocationId() === null) {
-			// Should only be the case in unit tests when adding dummy previews in the database.
-			return;
-		}
-
-		[
-			'urn' => $urn,
-			'store' => $store,
-		] = $this->getObjectStoreInfoForExistingPreview($preview);
-
-		try {
-			$store->deleteObject($urn);
-		} catch (\Exception $exception) {
-			throw new NotPermittedException('Unable to delete preview from object store', previous: $exception);
-		}
-	}
-
-	#[Override]
-	public function migratePreview(Preview $preview, SimpleFile $file): void {
-		// Just set the Preview::bucket and Preview::objectStore
-		$this->getObjectStoreInfoForNewPreview($preview, migration: true);
-		$this->previewMapper->update($preview);
-	}
-
-	/**
-	 * @return ObjectStoreDefinition
-	 */
-	private function getObjectStoreInfoForExistingPreview(Preview $preview): array {
-		$objectStoreName = $preview->getObjectStoreName();
-		$bucketName = $preview->getBucketName();
-		assert(!empty($objectStoreName));
-		assert(!empty($bucketName));
-
-		$config = $this->objectStoreConfig->getObjectStoreConfiguration($objectStoreName);
-		$config['arguments']['bucket'] = $preview->getBucketName();
-		$objectStoreName = $preview->getObjectStoreName();
-
-		return [
-			'urn' => $this->getUrn($preview, $config),
-			'store' => $this->getObjectStore($objectStoreName, $config),
-		];
-	}
-
-	/**
-	 * @return ObjectStoreDefinition
-	 */
-	private function getObjectStoreInfoForNewPreview(Preview $preview, bool $migration = false): array {
-		// When migrating old previews, use the 'root' object store configuration
-		$config = $this->objectStoreConfig->getObjectStoreConfiguration($migration ? 'root' : 'preview');
-		$objectStoreName = $this->objectStoreConfig->resolveAlias($migration ? 'root' : 'preview');
-
-		$bucketName = $config['arguments']['bucket'];
-		if ($config['arguments']['multibucket']) {
-			if ($this->isMultibucketPreviewDistributionEnabled) {
-				// Spread the previews on different buckets depending on their corresponding fileId
-				$oldLocationArray = str_split(substr(md5((string)$preview->getFileId()), 0, 2));
-				$bucketNumber = hexdec('0x' . $oldLocationArray[0]) * 16 + hexdec('0x' . $oldLocationArray[0]);
-				$bucketName .= '-preview-' . $bucketNumber;
-			} else {
-				// Put all previews in the root (0) bucket
-				$bucketName .= '0';
-			}
-		}
-		$config['arguments']['bucket'] = $bucketName;
-
-		// Get the locationId corresponding to the bucketName and objectStoreName, this will create
-		// a new one, if no matching location is found in the DB.
-		$locationId = $this->previewMapper->getLocationId($bucketName, $objectStoreName);
-		$preview->setLocationId($locationId);
-		$preview->setObjectStoreName($objectStoreName);
-		$preview->setBucketName($bucketName);
-
-		return [
-			'urn' => $this->getUrn($preview, $config),
-			'store' => $this->getObjectStore($objectStoreName, $config),
-		];
-	}
-
-	private function getObjectStore(string $objectStoreName, array $config): IObjectStore {
-		$bucketName = $config['arguments']['bucket'];
-
-		if (!isset($this->objectStoreCache[$objectStoreName])) {
-			$this->objectStoreCache[$objectStoreName] = [];
-			$this->objectStoreCache[$objectStoreName][$bucketName] = $this->objectStoreConfig->buildObjectStore($config);
-		} elseif (!isset($this->objectStoreCache[$objectStoreName][$bucketName])) {
-			$this->objectStoreCache[$objectStoreName][$bucketName] = $this->objectStoreConfig->buildObjectStore($config);
-		}
-
-		return $this->objectStoreCache[$objectStoreName][$bucketName];
-	}
-
-	public function getUrn(Preview $preview, array $config): string {
-		if ($preview->getOldFileId()) {
-			return ($config['arguments']['objectPrefix'] ?? 'urn:oid:') . $preview->getOldFileId();
-		}
-		if (isset($config['arguments']['objectPrefix'])) {
-			return ($config['arguments']['objectPrefix'] . 'preview:') . $preview->getId();
-		} else {
-			return 'uri:oid:preview:' . $preview->getId();
-		}
-	}
-
-	#[Override]
-	public function scan(): int {
-		return 0;
-	}
+    /**
+     * @var array<string, array<string, IObjectStore>>
+     */
+    private array $objectStoreCache = [];
+
+    private bool $isMultibucketPreviewDistributionEnabled;
+
+    public function __construct(
+        private readonly PrimaryObjectStoreConfig $objectStoreConfig,
+        IConfig $config,
+        private readonly PreviewMapper $previewMapper,
+    ) {
+        $this->isMultibucketPreviewDistributionEnabled = $config->getSystemValueBool('objectstore.multibucket.preview-distribution');
+    }
+
+    #[Override]
+    public function writePreview(Preview $preview, mixed $stream): int {
+        $size = 0;
+        $countStream = CountWrapper::wrap($stream, function (int $writtenSize) use (&$size): void {
+            $size = $writtenSize;
+        });
+
+        [
+            'urn' => $urn,
+            'store' => $store,
+        ] = $this->getObjectStoreInfoForNewPreview($preview);
+
+        try {
+            $store->writeObject($urn, $countStream);
+        } catch (\Exception $exception) {
+            throw new NotPermittedException('Unable to save preview to object store', previous: $exception);
+        }
+        return $size;
+    }
+
+    #[Override]
+    public function readPreview(Preview $preview): mixed {
+        [
+            'urn' => $urn,
+            'store' => $store,
+        ] = $this->getObjectStoreInfoForExistingPreview($preview);
+
+        try {
+            return $store->readObject($urn);
+        } catch (\Exception $exception) {
+            throw new NotPermittedException('Unable to read preview from object store with urn:' . $urn, previous: $exception);
+        }
+    }
+
+    #[Override]
+    public function deletePreview(Preview $preview): void {
+        if (defined('PHPUNIT_RUN') && $preview->getLocationId() === null) {
+            // Should only be the case in unit tests when adding dummy previews in the database.
+            return;
+        }
+
+        [
+            'urn' => $urn,
+            'store' => $store,
+        ] = $this->getObjectStoreInfoForExistingPreview($preview);
+
+        try {
+            $store->deleteObject($urn);
+        } catch (\Exception $exception) {
+            throw new NotPermittedException('Unable to delete preview from object store', previous: $exception);
+        }
+    }
+
+    #[Override]
+    public function migratePreview(Preview $preview, SimpleFile $file): void {
+        // Just set the Preview::bucket and Preview::objectStore
+        $this->getObjectStoreInfoForNewPreview($preview, migration: true);
+        $this->previewMapper->update($preview);
+    }
+
+    /**
+     * @return ObjectStoreDefinition
+     */
+    private function getObjectStoreInfoForExistingPreview(Preview $preview): array {
+        $objectStoreName = $preview->getObjectStoreName();
+        $bucketName = $preview->getBucketName();
+        assert(!empty($objectStoreName));
+        assert(!empty($bucketName));
+
+        $config = $this->objectStoreConfig->getObjectStoreConfiguration($objectStoreName);
+        $config['arguments']['bucket'] = $preview->getBucketName();
+        $objectStoreName = $preview->getObjectStoreName();
+
+        return [
+            'urn' => $this->getUrn($preview, $config),
+            'store' => $this->getObjectStore($objectStoreName, $config),
+        ];
+    }
+
+    /**
+     * @return ObjectStoreDefinition
+     */
+    private function getObjectStoreInfoForNewPreview(Preview $preview, bool $migration = false): array {
+        // When migrating old previews, use the 'root' object store configuration
+        $config = $this->objectStoreConfig->getObjectStoreConfiguration($migration ? 'root' : 'preview');
+        $objectStoreName = $this->objectStoreConfig->resolveAlias($migration ? 'root' : 'preview');
+
+        $bucketName = $config['arguments']['bucket'];
+        if ($config['arguments']['multibucket']) {
+            if ($this->isMultibucketPreviewDistributionEnabled) {
+                // Spread the previews on different buckets depending on their corresponding fileId
+                $oldLocationArray = str_split(substr(md5((string)$preview->getFileId()), 0, 2));
+                $bucketNumber = hexdec('0x' . $oldLocationArray[0]) * 16 + hexdec('0x' . $oldLocationArray[0]);
+                $bucketName .= '-preview-' . $bucketNumber;
+            } else {
+                // Put all previews in the root (0) bucket
+                $bucketName .= '0';
+            }
+        }
+        $config['arguments']['bucket'] = $bucketName;
+
+        // Get the locationId corresponding to the bucketName and objectStoreName, this will create
+        // a new one, if no matching location is found in the DB.
+        $locationId = $this->previewMapper->getLocationId($bucketName, $objectStoreName);
+        $preview->setLocationId($locationId);
+        $preview->setObjectStoreName($objectStoreName);
+        $preview->setBucketName($bucketName);
+
+        return [
+            'urn' => $this->getUrn($preview, $config),
+            'store' => $this->getObjectStore($objectStoreName, $config),
+        ];
+    }
+
+    private function getObjectStore(string $objectStoreName, array $config): IObjectStore {
+        $bucketName = $config['arguments']['bucket'];
+
+        if (!isset($this->objectStoreCache[$objectStoreName])) {
+            $this->objectStoreCache[$objectStoreName] = [];
+            $this->objectStoreCache[$objectStoreName][$bucketName] = $this->objectStoreConfig->buildObjectStore($config);
+        } elseif (!isset($this->objectStoreCache[$objectStoreName][$bucketName])) {
+            $this->objectStoreCache[$objectStoreName][$bucketName] = $this->objectStoreConfig->buildObjectStore($config);
+        }
+
+        return $this->objectStoreCache[$objectStoreName][$bucketName];
+    }
+
+    public function getUrn(Preview $preview, array $config): string {
+        if ($preview->getOldFileId()) {
+            return ($config['arguments']['objectPrefix'] ?? 'urn:oid:') . $preview->getOldFileId();
+        }
+        if (isset($config['arguments']['objectPrefix'])) {
+            return ($config['arguments']['objectPrefix'] . 'preview:') . $preview->getId();
+        } else {
+            return 'uri:oid:preview:' . $preview->getId();
+        }
+    }
+
+    #[Override]
+    public function scan(): int {
+        return 0;
+    }
 }

lib/private/AppConfig.php

Indentation +1794 added lines, -1794 removed lines

@@ -51,1798 +51,1798 @@
  * @since 29.0.0 - Supporting types and lazy loading
  */
 class AppConfig implements IAppConfig {
-	private const APP_MAX_LENGTH = 32;
-	private const KEY_MAX_LENGTH = 64;
-	private const ENCRYPTION_PREFIX = '$AppConfigEncryption$';
-	private const ENCRYPTION_PREFIX_LENGTH = 21; // strlen(self::ENCRYPTION_PREFIX)
-	private const LOCAL_CACHE_KEY = 'OC\\AppConfig';
-	private const LOCAL_CACHE_TTL = 3;
-
-	/** @var array<string, array<string, string>> ['app_id' => ['config_key' => 'config_value']] */
-	private array $fastCache = [];   // cache for normal config keys
-	/** @var array<string, array<string, string>> ['app_id' => ['config_key' => 'config_value']] */
-	private array $lazyCache = [];   // cache for lazy config keys
-	/** @var array<string, array<string, int>> ['app_id' => ['config_key' => bitflag]] */
-	private array $valueTypes = [];  // type for all config values
-	private bool $fastLoaded = false;
-	private bool $lazyLoaded = false;
-	/** @var array<string, array{entries: array<string, Entry>, aliases: array<string, string>, strictness: Strictness}> ['app_id' => ['strictness' => ConfigLexiconStrictness, 'entries' => ['config_key' => ConfigLexiconEntry[]]] */
-	private array $configLexiconDetails = [];
-	private bool $ignoreLexiconAliases = false;
-	private array $strictnessApplied = [];
-
-	/** @var ?array<string, string> */
-	private ?array $appVersionsCache = null;
-	private ?ICache $localCache = null;
-
-	public function __construct(
-		protected IDBConnection $connection,
-		protected IConfig $config,
-		private readonly ConfigManager $configManager,
-		private readonly PresetManager $presetManager,
-		protected LoggerInterface $logger,
-		protected ICrypto $crypto,
-		public readonly CacheFactory $cacheFactory,
-	) {
-		if ($config->getSystemValueBool('cache_app_config', true) && $cacheFactory->isLocalCacheAvailable()) {
-			$cacheFactory->withServerVersionPrefix(function (ICacheFactory $factory) {
-				$this->localCache = $factory->createLocal();
-			});
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @return list<string> list of app ids
-	 * @since 7.0.0
-	 */
-	public function getApps(): array {
-		$this->loadConfig(lazy: true);
-		$apps = array_merge(array_keys($this->fastCache), array_keys($this->lazyCache));
-		sort($apps);
-
-		return array_values(array_unique($apps));
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @return list<string> list of stored config keys
-	 * @see searchKeys to not load lazy config keys
-	 *
-	 * @since 29.0.0
-	 */
-	public function getKeys(string $app): array {
-		$this->assertParams($app);
-		$this->loadConfig($app, true);
-		$keys = array_merge(array_keys($this->fastCache[$app] ?? []), array_keys($this->lazyCache[$app] ?? []));
-		sort($keys);
-
-		return array_values(array_unique($keys));
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $prefix returns only keys starting with this value
-	 * @param bool $lazy TRUE to search in lazy config keys
-	 * @return list<string> list of stored config keys
-	 * @since 32.0.0
-	 */
-	public function searchKeys(string $app, string $prefix = '', bool $lazy = false): array {
-		$this->assertParams($app);
-		$this->loadConfig($app, $lazy);
-		if ($lazy) {
-			$keys = array_keys($this->lazyCache[$app] ?? []);
-		} else {
-			$keys = array_keys($this->fastCache[$app] ?? []);
-		}
-
-		if ($prefix !== '') {
-			$keys = array_filter($keys, static fn (string $key): bool => str_starts_with($key, $prefix));
-		}
-
-		sort($keys);
-		return array_values(array_unique($keys));
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
-	 *
-	 * @return bool TRUE if key exists
-	 * @since 7.0.0
-	 * @since 29.0.0 Added the $lazy argument
-	 */
-	public function hasKey(string $app, string $key, ?bool $lazy = false): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfig($app, $lazy ?? true);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		$hasLazy = isset($this->lazyCache[$app][$key]);
-		$hasFast = isset($this->fastCache[$app][$key]);
-		if ($lazy === null) {
-			return $hasLazy || $hasFast;
-		} else {
-			return $lazy ? $hasLazy : $hasFast;
-		}
-	}
-
-	/**
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
-	 *
-	 * @return bool
-	 * @throws AppConfigUnknownKeyException if config key is not known
-	 * @since 29.0.0
-	 */
-	public function isSensitive(string $app, string $key, ?bool $lazy = false): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfig(null, $lazy ?? true);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		if (!isset($this->valueTypes[$app][$key])) {
-			throw new AppConfigUnknownKeyException('unknown config key');
-		}
-
-		return $this->isTyped(self::VALUE_SENSITIVE, $this->valueTypes[$app][$key]);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app if of the app
-	 * @param string $key config key
-	 *
-	 * @return bool TRUE if config is lazy loaded
-	 * @throws AppConfigUnknownKeyException if config key is not known
-	 * @see IAppConfig for details about lazy loading
-	 * @since 29.0.0
-	 */
-	public function isLazy(string $app, string $key): bool {
-		$this->assertParams($app, $key);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		// there is a huge probability the non-lazy config are already loaded
-		if ($this->hasKey($app, $key, false)) {
-			return false;
-		}
-
-		// key not found, we search in the lazy config
-		if ($this->hasKey($app, $key, true)) {
-			return true;
-		}
-
-		throw new AppConfigUnknownKeyException('unknown config key');
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $prefix config keys prefix to search
-	 * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
-	 *
-	 * @return array<string, string|int|float|bool|array> [configKey => configValue]
-	 * @since 29.0.0
-	 */
-	public function getAllValues(string $app, string $prefix = '', bool $filtered = false): array {
-		$this->assertParams($app, $prefix);
-		// if we want to filter values, we need to get sensitivity
-		$this->loadConfig($app, true);
-		// array_merge() will remove numeric keys (here config keys), so addition arrays instead
-		$values = $this->formatAppValues($app, ($this->fastCache[$app] ?? []) + ($this->lazyCache[$app] ?? []));
-		$values = array_filter(
-			$values,
-			function (string $key) use ($prefix): bool {
-				return str_starts_with($key, $prefix); // filter values based on $prefix
-			}, ARRAY_FILTER_USE_KEY
-		);
-
-		if (!$filtered) {
-			return $values;
-		}
-
-		/**
-		 * Using the old (deprecated) list of sensitive values.
-		 */
-		foreach ($this->getSensitiveKeys($app) as $sensitiveKeyExp) {
-			$sensitiveKeys = preg_grep($sensitiveKeyExp, array_keys($values));
-			foreach ($sensitiveKeys as $sensitiveKey) {
-				$this->valueTypes[$app][$sensitiveKey] = ($this->valueTypes[$app][$sensitiveKey] ?? 0) | self::VALUE_SENSITIVE;
-			}
-		}
-
-		$result = [];
-		foreach ($values as $key => $value) {
-			$result[$key] = $this->isTyped(self::VALUE_SENSITIVE, $this->valueTypes[$app][$key] ?? 0) ? IConfig::SENSITIVE_VALUE : $value;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $key config key
-	 * @param bool $lazy search within lazy loaded config
-	 * @param int|null $typedAs enforce type for the returned values ({@see self::VALUE_STRING} and others)
-	 *
-	 * @return array<string, string|int|float|bool|array> [appId => configValue]
-	 * @since 29.0.0
-	 */
-	public function searchValues(string $key, bool $lazy = false, ?int $typedAs = null): array {
-		$this->assertParams('', $key, true);
-		$this->loadConfig(null, $lazy);
-
-		/** @var array<array-key, array<array-key, mixed>> $cache */
-		if ($lazy) {
-			$cache = $this->lazyCache;
-		} else {
-			$cache = $this->fastCache;
-		}
-
-		$values = [];
-		foreach (array_keys($cache) as $app) {
-			if (isset($cache[$app][$key])) {
-				$values[$app] = $this->convertTypedValue($cache[$app][$key], $typedAs ?? $this->getValueType((string)$app, $key, $lazy));
-			}
-		}
-
-		return $values;
-	}
-
-
-	/**
-	 * Get the config value as string.
-	 * If the value does not exist the given default will be returned.
-	 *
-	 * Set lazy to `null` to ignore it and get the value from either source.
-	 *
-	 * **WARNING:** Method is internal and **SHOULD** not be used, as it is better to get the value with a type.
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default config value
-	 * @param null|bool $lazy get config as lazy loaded or not. can be NULL
-	 *
-	 * @return string the value or $default
-	 * @internal
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 * @see getValueString()
-	 * @see getValueInt()
-	 * @see getValueFloat()
-	 * @see getValueBool()
-	 * @see getValueArray()
-	 */
-	public function getValueMixed(
-		string $app,
-		string $key,
-		string $default = '',
-		?bool $lazy = false,
-	): string {
-		try {
-			$lazy = ($lazy === null) ? $this->isLazy($app, $key) : $lazy;
-		} catch (AppConfigUnknownKeyException) {
-			return $default;
-		}
-
-		return $this->getTypedValue(
-			$app,
-			$key,
-			$default,
-			$lazy,
-			self::VALUE_MIXED
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return string stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueString(
-		string $app,
-		string $key,
-		string $default = '',
-		bool $lazy = false,
-	): string {
-		return $this->getTypedValue($app, $key, $default, $lazy, self::VALUE_STRING);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return int stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueInt(
-		string $app,
-		string $key,
-		int $default = 0,
-		bool $lazy = false,
-	): int {
-		return (int)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_INT);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param float $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return float stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueFloat(string $app, string $key, float $default = 0, bool $lazy = false): float {
-		return (float)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_FLOAT);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return bool stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueBool(string $app, string $key, bool $default = false, bool $lazy = false): bool {
-		$b = strtolower($this->getTypedValue($app, $key, $default ? 'true' : 'false', $lazy, self::VALUE_BOOL));
-		return in_array($b, ['1', 'true', 'yes', 'on']);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param array $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return array stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueArray(
-		string $app,
-		string $key,
-		array $default = [],
-		bool $lazy = false,
-	): array {
-		try {
-			$defaultJson = json_encode($default, JSON_THROW_ON_ERROR);
-			$value = json_decode($this->getTypedValue($app, $key, $defaultJson, $lazy, self::VALUE_ARRAY), true, flags: JSON_THROW_ON_ERROR);
-
-			return is_array($value) ? $value : [];
-		} catch (JsonException) {
-			return [];
-		}
-	}
-
-	/**
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT}{@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
-	 *
-	 * @return string
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @throws InvalidArgumentException
-	 */
-	private function getTypedValue(
-		string $app,
-		string $key,
-		string $default,
-		bool $lazy,
-		int $type,
-	): string {
-		$this->assertParams($app, $key, valueType: $type);
-		$origKey = $key;
-		$matched = $this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type, $default);
-		if ($default === null) {
-			// there is no logical reason for it to be null
-			throw new \Exception('default cannot be null');
-		}
-
-		// returns default if strictness of lexicon is set to WARNING (block and report)
-		if (!$matched) {
-			return $default;
-		}
-
-		$this->loadConfig($app, $lazy ?? true);
-
-		/**
-		 * We ignore check if mixed type is requested.
-		 * If type of stored value is set as mixed, we don't filter.
-		 * If type of stored value is defined, we compare with the one requested.
-		 */
-		$knownType = $this->valueTypes[$app][$key] ?? 0;
-		if (!$this->isTyped(self::VALUE_MIXED, $type)
-			&& $knownType > 0
-			&& !$this->isTyped(self::VALUE_MIXED, $knownType)
-			&& !$this->isTyped($type, $knownType)) {
-			$this->logger->warning('conflict with value type from database', ['app' => $app, 'key' => $key, 'type' => $type, 'knownType' => $knownType]);
-			throw new AppConfigTypeConflictException('conflict with value type from database');
-		}
-
-		/**
-		 * - the pair $app/$key cannot exist in both array,
-		 * - we should still return an existing non-lazy value even if current method
-		 *   is called with $lazy is true
-		 *
-		 * This way, lazyCache will be empty until the load for lazy config value is requested.
-		 */
-		if (isset($this->lazyCache[$app][$key])) {
-			$value = $this->lazyCache[$app][$key];
-		} elseif (isset($this->fastCache[$app][$key])) {
-			$value = $this->fastCache[$app][$key];
-		} else {
-			return $default;
-		}
-
-		$sensitive = $this->isTyped(self::VALUE_SENSITIVE, $knownType);
-		if ($sensitive && str_starts_with($value, self::ENCRYPTION_PREFIX)) {
-			// Only decrypt values that are stored encrypted
-			$value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
-		}
-
-		// in case the key was modified while running matchAndApplyLexiconDefinition() we are
-		// interested to check options in case a modification of the value is needed
-		// ie inverting value from previous key when using lexicon option RENAME_INVERT_BOOLEAN
-		if ($origKey !== $key && $type === self::VALUE_BOOL) {
-			$value = ($this->configManager->convertToBool($value, $this->getLexiconEntry($app, $key))) ? '1' : '0';
-		}
-
-		return $value;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @return int type of the value
-	 * @throws AppConfigUnknownKeyException if config key is not known
-	 * @since 29.0.0
-	 * @see VALUE_STRING
-	 * @see VALUE_INT
-	 * @see VALUE_FLOAT
-	 * @see VALUE_BOOL
-	 * @see VALUE_ARRAY
-	 */
-	public function getValueType(string $app, string $key, ?bool $lazy = null): int {
-		$type = self::VALUE_MIXED;
-		$ignorable = $lazy ?? false;
-		$this->matchAndApplyLexiconDefinition($app, $key, $ignorable, $type);
-		if ($type !== self::VALUE_MIXED) {
-			// a modified $type means config key is set in Lexicon
-			return $type;
-		}
-
-		$this->assertParams($app, $key);
-		$this->loadConfig($app, $lazy ?? true);
-
-		if (!isset($this->valueTypes[$app][$key])) {
-			throw new AppConfigUnknownKeyException('unknown config key');
-		}
-
-		$type = $this->valueTypes[$app][$key];
-		$type &= ~self::VALUE_SENSITIVE;
-		return $type;
-	}
-
-
-	/**
-	 * Store a config key and its value in database as VALUE_MIXED
-	 *
-	 * **WARNING:** Method is internal and **MUST** not be used as it is best to set a real value type
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED
-	 * @internal
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 * @see setValueString()
-	 * @see setValueInt()
-	 * @see setValueFloat()
-	 * @see setValueBool()
-	 * @see setValueArray()
-	 */
-	public function setValueMixed(
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		return $this->setTypedValue(
-			$app,
-			$key,
-			$value,
-			$lazy,
-			self::VALUE_MIXED | ($sensitive ? self::VALUE_SENSITIVE : 0)
-		);
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueString(
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		return $this->setTypedValue(
-			$app,
-			$key,
-			$value,
-			$lazy,
-			self::VALUE_STRING | ($sensitive ? self::VALUE_SENSITIVE : 0)
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueInt(
-		string $app,
-		string $key,
-		int $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		if ($value > 2000000000) {
-			$this->logger->debug('You are trying to store an integer value around/above 2,147,483,647. This is a reminder that reaching this theoretical limit on 32 bits system will throw an exception.');
-		}
-
-		return $this->setTypedValue(
-			$app,
-			$key,
-			(string)$value,
-			$lazy,
-			self::VALUE_INT | ($sensitive ? self::VALUE_SENSITIVE : 0)
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param float $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueFloat(
-		string $app,
-		string $key,
-		float $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		return $this->setTypedValue(
-			$app,
-			$key,
-			(string)$value,
-			$lazy,
-			self::VALUE_FLOAT | ($sensitive ? self::VALUE_SENSITIVE : 0)
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueBool(
-		string $app,
-		string $key,
-		bool $value,
-		bool $lazy = false,
-	): bool {
-		return $this->setTypedValue(
-			$app,
-			$key,
-			($value) ? '1' : '0',
-			$lazy,
-			self::VALUE_BOOL
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param array $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @throws JsonException
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueArray(
-		string $app,
-		string $key,
-		array $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		try {
-			return $this->setTypedValue(
-				$app,
-				$key,
-				json_encode($value, JSON_THROW_ON_ERROR),
-				$lazy,
-				self::VALUE_ARRAY | ($sensitive ? self::VALUE_SENSITIVE : 0)
-			);
-		} catch (JsonException $e) {
-			$this->logger->warning('could not setValueArray', ['app' => $app, 'key' => $key, 'exception' => $e]);
-			throw $e;
-		}
-	}
-
-	/**
-	 * Store a config key and its value in database
-	 *
-	 * If config key is already known with the exact same config value and same sensitive/lazy status, the
-	 * database is not updated. If config value was previously stored as sensitive, status will not be
-	 * altered.
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy config set as lazy loaded
-	 * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT} {@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
-	 *
-	 * @return bool TRUE if value was updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	private function setTypedValue(
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy,
-		int $type,
-	): bool {
-		$this->assertParams($app, $key);
-		if (!$this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type)) {
-			return false; // returns false as database is not updated
-		}
-		$this->loadConfig(null, $lazy ?? true);
-
-		$sensitive = $this->isTyped(self::VALUE_SENSITIVE, $type);
-		$inserted = $refreshCache = false;
-
-		$origValue = $value;
-		if ($sensitive || ($this->hasKey($app, $key, $lazy) && $this->isSensitive($app, $key, $lazy))) {
-			$value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
-		}
-
-		if ($this->hasKey($app, $key, $lazy)) {
-			/**
-			 * no update if key is already known with set lazy status and value is
-			 * not different, unless sensitivity is switched from false to true.
-			 */
-			if ($origValue === $this->getTypedValue($app, $key, $value, $lazy ?? true, $type)
-				&& (!$sensitive || $this->isSensitive($app, $key, $lazy))) {
-				return false;
-			}
-		} else {
-			/**
-			 * if key is not known yet, we try to insert.
-			 * It might fail if the key exists with a different lazy flag.
-			 */
-			try {
-				$insert = $this->connection->getQueryBuilder();
-				$insert->insert('appconfig')
-					->setValue('appid', $insert->createNamedParameter($app))
-					->setValue('lazy', $insert->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
-					->setValue('type', $insert->createNamedParameter($type, IQueryBuilder::PARAM_INT))
-					->setValue('configkey', $insert->createNamedParameter($key))
-					->setValue('configvalue', $insert->createNamedParameter($value));
-				$insert->executeStatement();
-				$inserted = true;
-			} catch (DBException $e) {
-				if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					throw $e; // TODO: throw exception or just log and returns false !?
-				}
-			}
-		}
-
-		/**
-		 * We cannot insert a new row, meaning we need to update an already existing one
-		 */
-		if (!$inserted) {
-			$currType = $this->valueTypes[$app][$key] ?? 0;
-			if ($currType === 0) { // this might happen when switching lazy loading status
-				$this->loadConfig(lazy: true);
-				$currType = $this->valueTypes[$app][$key] ?? 0;
-			}
-
-			/**
-			 * This should only happen during the upgrade process from 28 to 29.
-			 * We only log a warning and set it to VALUE_MIXED.
-			 */
-			if ($currType === 0) {
-				$this->logger->warning('Value type is set to zero (0) in database. This is fine only during the upgrade process from 28 to 29.', ['app' => $app, 'key' => $key]);
-				$currType = self::VALUE_MIXED;
-			}
-
-			/**
-			 * we only accept a different type from the one stored in database
-			 * if the one stored in database is not-defined (VALUE_MIXED)
-			 */
-			if (!$this->isTyped(self::VALUE_MIXED, $currType)
-				&& ($type | self::VALUE_SENSITIVE) !== ($currType | self::VALUE_SENSITIVE)) {
-				try {
-					$currType = $this->convertTypeToString($currType);
-					$type = $this->convertTypeToString($type);
-				} catch (AppConfigIncorrectTypeException) {
-					// can be ignored, this was just needed for a better exception message.
-				}
-				throw new AppConfigTypeConflictException('conflict between new type (' . $type . ') and old type (' . $currType . ')');
-			}
-
-			// we fix $type if the stored value, or the new value as it might be changed, is set as sensitive
-			if ($sensitive || $this->isTyped(self::VALUE_SENSITIVE, $currType)) {
-				$type |= self::VALUE_SENSITIVE;
-			}
-
-			try {
-				if ($lazy !== $this->isLazy($app, $key)) {
-					$refreshCache = true;
-				}
-			} catch (AppConfigUnknownKeyException) {
-				// pass
-			}
-
-			$update = $this->connection->getQueryBuilder();
-			$update->update('appconfig')
-				->set('configvalue', $update->createNamedParameter($value))
-				->set('lazy', $update->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
-				->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
-				->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-				->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-
-			$update->executeStatement();
-		}
-
-		if ($refreshCache) {
-			$this->clearCache();
-			return true;
-		}
-
-		// update local cache
-		if ($lazy) {
-			$this->lazyCache[$app][$key] = $value;
-		} else {
-			$this->fastCache[$app][$key] = $value;
-		}
-		$this->valueTypes[$app][$key] = $type;
-		$this->clearLocalCache();
-
-		return true;
-	}
-
-	/**
-	 * Change the type of config value.
-	 *
-	 * **WARNING:** Method is internal and **MUST** not be used as it may break things.
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT} {@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
-	 *
-	 * @return bool TRUE if database update were necessary
-	 * @throws AppConfigUnknownKeyException if $key is now known in database
-	 * @throws AppConfigIncorrectTypeException if $type is not valid
-	 * @internal
-	 * @since 29.0.0
-	 */
-	public function updateType(string $app, string $key, int $type = self::VALUE_MIXED): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfig(lazy: true);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-		$this->isLazy($app, $key); // confirm key exists
-
-		// type can only be one type
-		if (!in_array($type, [self::VALUE_MIXED, self::VALUE_STRING, self::VALUE_INT, self::VALUE_FLOAT, self::VALUE_BOOL, self::VALUE_ARRAY])) {
-			throw new AppConfigIncorrectTypeException('Unknown value type');
-		}
-
-		$currType = $this->valueTypes[$app][$key];
-		if (($type | self::VALUE_SENSITIVE) === ($currType | self::VALUE_SENSITIVE)) {
-			return false;
-		}
-
-		// we complete with sensitive flag if the stored value is set as sensitive
-		if ($this->isTyped(self::VALUE_SENSITIVE, $currType)) {
-			$type = $type | self::VALUE_SENSITIVE;
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('appconfig')
-			->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
-			->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-		$this->valueTypes[$app][$key] = $type;
-
-		return true;
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $sensitive TRUE to set as sensitive, FALSE to unset
-	 *
-	 * @return bool TRUE if entry was found in database and an update was necessary
-	 * @since 29.0.0
-	 */
-	public function updateSensitive(string $app, string $key, bool $sensitive): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfig(lazy: true);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		try {
-			if ($sensitive === $this->isSensitive($app, $key, null)) {
-				return false;
-			}
-		} catch (AppConfigUnknownKeyException $e) {
-			return false;
-		}
-
-		$lazy = $this->isLazy($app, $key);
-		if ($lazy) {
-			$cache = $this->lazyCache;
-		} else {
-			$cache = $this->fastCache;
-		}
-
-		if (!isset($cache[$app][$key])) {
-			throw new AppConfigUnknownKeyException('unknown config key');
-		}
-
-		/**
-		 * type returned by getValueType() is already cleaned from sensitive flag
-		 * we just need to update it based on $sensitive and store it in database
-		 */
-		$type = $this->getValueType($app, $key);
-		$value = $cache[$app][$key];
-		if ($sensitive) {
-			$type |= self::VALUE_SENSITIVE;
-			$value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
-		} else {
-			$value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('appconfig')
-			->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
-			->set('configvalue', $update->createNamedParameter($value))
-			->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		$this->valueTypes[$app][$key] = $type;
-
-		return true;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $lazy TRUE to set as lazy loaded, FALSE to unset
-	 *
-	 * @return bool TRUE if entry was found in database and an update was necessary
-	 * @since 29.0.0
-	 */
-	public function updateLazy(string $app, string $key, bool $lazy): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfig(lazy: true);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		try {
-			if ($lazy === $this->isLazy($app, $key)) {
-				return false;
-			}
-		} catch (AppConfigUnknownKeyException $e) {
-			return false;
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('appconfig')
-			->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT))
-			->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		// At this point, it is a lot safer to clean cache
-		$this->clearCache();
-
-		return true;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @return array
-	 * @throws AppConfigUnknownKeyException if config key is not known in database
-	 * @since 29.0.0
-	 */
-	public function getDetails(string $app, string $key): array {
-		$this->assertParams($app, $key);
-		$this->loadConfig(lazy: true);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-		$lazy = $this->isLazy($app, $key);
-
-		if ($lazy) {
-			$cache = $this->lazyCache;
-		} else {
-			$cache = $this->fastCache;
-		}
-
-		$type = $this->getValueType($app, $key);
-		try {
-			$typeString = $this->convertTypeToString($type);
-		} catch (AppConfigIncorrectTypeException $e) {
-			$this->logger->warning('type stored in database is not correct', ['exception' => $e, 'type' => $type]);
-			$typeString = (string)$type;
-		}
-
-		if (!isset($cache[$app][$key])) {
-			throw new AppConfigUnknownKeyException('unknown config key');
-		}
-
-		$value = $cache[$app][$key];
-		$sensitive = $this->isSensitive($app, $key, null);
-		if ($sensitive && str_starts_with($value, self::ENCRYPTION_PREFIX)) {
-			$value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
-		}
-
-		return [
-			'app' => $app,
-			'key' => $key,
-			'value' => $value,
-			'type' => $type,
-			'lazy' => $lazy,
-			'typeString' => $typeString,
-			'sensitive' => $sensitive
-		];
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @return array{app: string, key: string, lazy?: bool, valueType?: ValueType, valueTypeName?: string, sensitive?: bool, internal?: bool, default?: string, definition?: string, note?: string}
-	 * @since 32.0.0
-	 */
-	public function getKeyDetails(string $app, string $key): array {
-		$this->assertParams($app, $key);
-		try {
-			$details = $this->getDetails($app, $key);
-		} catch (AppConfigUnknownKeyException) {
-			$details = [
-				'app' => $app,
-				'key' => $key
-			];
-		}
-
-		/** @var Entry $lexiconEntry */
-		try {
-			$lazy = false;
-			$this->matchAndApplyLexiconDefinition($app, $key, $lazy, lexiconEntry: $lexiconEntry);
-		} catch (AppConfigTypeConflictException|AppConfigUnknownKeyException) {
-			// can be ignored
-		}
-
-		if ($lexiconEntry !== null) {
-			$details = array_merge($details, [
-				'lazy' => $lexiconEntry->isLazy(),
-				'valueType' => $lexiconEntry->getValueType(),
-				'valueTypeName' => $lexiconEntry->getValueType()->name,
-				'sensitive' => $lexiconEntry->isFlagged(self::FLAG_SENSITIVE),
-				'internal' => $lexiconEntry->isFlagged(self::FLAG_INTERNAL),
-				'default' => $lexiconEntry->getDefault($this->presetManager->getLexiconPreset()),
-				'definition' => $lexiconEntry->getDefinition(),
-				'note' => $lexiconEntry->getNote(),
-			]);
-		}
-
-		return array_filter($details, static fn ($v): bool => ($v !== null));
-	}
-
-	/**
-	 * @param string $type
-	 *
-	 * @return int
-	 * @throws AppConfigIncorrectTypeException
-	 * @since 29.0.0
-	 */
-	public function convertTypeToInt(string $type): int {
-		return match (strtolower($type)) {
-			'mixed' => IAppConfig::VALUE_MIXED,
-			'string' => IAppConfig::VALUE_STRING,
-			'integer' => IAppConfig::VALUE_INT,
-			'float' => IAppConfig::VALUE_FLOAT,
-			'boolean' => IAppConfig::VALUE_BOOL,
-			'array' => IAppConfig::VALUE_ARRAY,
-			default => throw new AppConfigIncorrectTypeException('Unknown type ' . $type)
-		};
-	}
-
-	/**
-	 * @param int $type
-	 *
-	 * @return string
-	 * @throws AppConfigIncorrectTypeException
-	 * @since 29.0.0
-	 */
-	public function convertTypeToString(int $type): string {
-		$type &= ~self::VALUE_SENSITIVE;
-
-		return match ($type) {
-			IAppConfig::VALUE_MIXED => 'mixed',
-			IAppConfig::VALUE_STRING => 'string',
-			IAppConfig::VALUE_INT => 'integer',
-			IAppConfig::VALUE_FLOAT => 'float',
-			IAppConfig::VALUE_BOOL => 'boolean',
-			IAppConfig::VALUE_ARRAY => 'array',
-			default => throw new AppConfigIncorrectTypeException('Unknown numeric type ' . $type)
-		};
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @since 29.0.0
-	 */
-	public function deleteKey(string $app, string $key): void {
-		$this->assertParams($app, $key);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('appconfig')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
-			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
-		$qb->executeStatement();
-
-		unset($this->lazyCache[$app][$key]);
-		unset($this->fastCache[$app][$key]);
-		unset($this->valueTypes[$app][$key]);
-		$this->clearLocalCache();
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 *
-	 * @since 29.0.0
-	 */
-	public function deleteApp(string $app): void {
-		$this->assertParams($app);
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('appconfig')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)));
-		$qb->executeStatement();
-
-		$this->clearCache();
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param bool $reload set to TRUE to refill cache instantly after clearing it
-	 *
-	 * @internal
-	 * @since 29.0.0
-	 */
-	public function clearCache(bool $reload = false): void {
-		$this->lazyLoaded = $this->fastLoaded = false;
-		$this->lazyCache = $this->fastCache = $this->valueTypes = $this->configLexiconDetails = [];
-		$this->localCache?->remove(self::LOCAL_CACHE_KEY);
-
-		if (!$reload) {
-			return;
-		}
-
-		$this->loadConfig(lazy: true);
-	}
-
-
-	/**
-	 * For debug purpose.
-	 * Returns the cached data.
-	 *
-	 * @return array
-	 * @since 29.0.0
-	 * @internal
-	 */
-	public function statusCache(): array {
-		return [
-			'fastLoaded' => $this->fastLoaded,
-			'fastCache' => $this->fastCache,
-			'lazyLoaded' => $this->lazyLoaded,
-			'lazyCache' => $this->lazyCache,
-		];
-	}
-
-	/**
-	 * @param int $needle bitflag to search
-	 * @param int $type known value
-	 *
-	 * @return bool TRUE if bitflag $needle is set in $type
-	 */
-	private function isTyped(int $needle, int $type): bool {
-		return (($needle & $type) !== 0);
-	}
-
-	/**
-	 * Confirm the string set for app and key fit the database description
-	 *
-	 * @param string $app assert $app fit in database
-	 * @param string $configKey assert config key fit in database
-	 * @param bool $allowEmptyApp $app can be empty string
-	 * @param int $valueType assert value type is only one type
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	private function assertParams(string $app = '', string $configKey = '', bool $allowEmptyApp = false, int $valueType = -1): void {
-		if (!$allowEmptyApp && $app === '') {
-			throw new InvalidArgumentException('app cannot be an empty string');
-		}
-		if (strlen($app) > self::APP_MAX_LENGTH) {
-			throw new InvalidArgumentException(
-				'Value (' . $app . ') for app is too long (' . self::APP_MAX_LENGTH . ')'
-			);
-		}
-		if (strlen($configKey) > self::KEY_MAX_LENGTH) {
-			throw new InvalidArgumentException('Value (' . $configKey . ') for key is too long (' . self::KEY_MAX_LENGTH . ')');
-		}
-		if ($valueType > -1) {
-			$valueType &= ~self::VALUE_SENSITIVE;
-			if (!in_array($valueType, [self::VALUE_MIXED, self::VALUE_STRING, self::VALUE_INT, self::VALUE_FLOAT, self::VALUE_BOOL, self::VALUE_ARRAY])) {
-				throw new InvalidArgumentException('Unknown value type');
-			}
-		}
-	}
-
-	/**
-	 * Load normal config or config set as lazy loaded
-	 *
-	 * @param bool $lazy set to TRUE to also load config values set as lazy loaded
-	 */
-	private function loadConfig(?string $app = null, bool $lazy = false): void {
-		if ($this->isLoaded($lazy)) {
-			return;
-		}
-
-		// if lazy is null or true, we debug log
-		if ($lazy === true && $app !== null) {
-			$exception = new \RuntimeException('The loading of lazy AppConfig values have been triggered by app "' . $app . '"');
-			$this->logger->debug($exception->getMessage(), ['exception' => $exception, 'app' => $app]);
-		}
-
-		$loadLazyOnly = $lazy && $this->isLoaded();
-
-		/** @var array<mixed> */
-		$cacheContent = $this->localCache?->get(self::LOCAL_CACHE_KEY) ?? [];
-		$includesLazyValues = !empty($cacheContent) && !empty($cacheContent['lazyCache']);
-		if (!empty($cacheContent) && (!$lazy || $includesLazyValues)) {
-			$this->valueTypes = $cacheContent['valueTypes'];
-			$this->fastCache = $cacheContent['fastCache'];
-			$this->fastLoaded = !empty($this->fastCache);
-			if ($includesLazyValues) {
-				$this->lazyCache = $cacheContent['lazyCache'];
-				$this->lazyLoaded = !empty($this->lazyCache);
-			}
-			return;
-		}
-
-		// Otherwise no cache available and we need to fetch from database
-		$qb = $this->connection->getQueryBuilder();
-		$qb->from('appconfig')
-			->select('appid', 'configkey', 'configvalue', 'type');
-
-		if ($lazy === false) {
-			$qb->where($qb->expr()->eq('lazy', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-		} else {
-			if ($loadLazyOnly) {
-				$qb->where($qb->expr()->eq('lazy', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
-			}
-			$qb->addSelect('lazy');
-		}
-
-		$result = $qb->executeQuery();
-		$rows = $result->fetchAll();
-		foreach ($rows as $row) {
-			// most of the time, 'lazy' is not in the select because its value is already known
-			if ($lazy && ((int)$row['lazy']) === 1) {
-				$this->lazyCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
-			} else {
-				$this->fastCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
-			}
-			$this->valueTypes[$row['appid']][$row['configkey']] = (int)($row['type'] ?? 0);
-		}
-
-		$result->closeCursor();
-		$this->localCache?->set(
-			self::LOCAL_CACHE_KEY,
-			[
-				'fastCache' => $this->fastCache,
-				'lazyCache' => $this->lazyCache,
-				'valueTypes' => $this->valueTypes,
-			],
-			self::LOCAL_CACHE_TTL,
-		);
-
-		$this->fastLoaded = true;
-		$this->lazyLoaded = $lazy;
-	}
-
-	/**
-	 * @param bool $lazy - If set to true then also check if lazy values are loaded
-	 */
-	private function isLoaded(bool $lazy = false): bool {
-		return $this->fastLoaded && (!$lazy || $this->lazyLoaded);
-	}
-
-	/**
-	 * Gets the config value
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string $default - Default value if the key does not exist
-	 *
-	 * @return string the value or $default
-	 * @deprecated 29.0.0 use getValue*()
-	 *
-	 * This function gets a value from the appconfig table. If the key does
-	 * not exist the default value will be returned
-	 */
-	public function getValue($app, $key, $default = '') {
-		$this->loadConfig($app);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		return $this->fastCache[$app][$key] ?? $default;
-	}
-
-	/**
-	 * Sets a value. If the key did not exist before it will be created.
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string|float|int $value value
-	 *
-	 * @return bool True if the value was inserted or updated, false if the value was the same
-	 * @throws AppConfigTypeConflictException
-	 * @throws AppConfigUnknownKeyException
-	 * @deprecated 29.0.0
-	 */
-	public function setValue($app, $key, $value) {
-		/**
-		 * TODO: would it be overkill, or decently improve performance, to catch
-		 * call to this method with $key='enabled' and 'hide' config value related
-		 * to $app when the app is disabled (by modifying entry in database: lazy=lazy+2)
-		 * or enabled (lazy=lazy-2)
-		 *
-		 * this solution would remove the loading of config values from disabled app
-		 * unless calling the method.
-		 */
-		return $this->setTypedValue($app, $key, (string)$value, false, self::VALUE_MIXED);
-	}
-
-
-	/**
-	 * get multiple values, either the app or key can be used as wildcard by setting it to false
-	 *
-	 * @param string|false $app
-	 * @param string|false $key
-	 *
-	 * @return array|false
-	 * @deprecated 29.0.0 use {@see getAllValues()}
-	 */
-	public function getValues($app, $key) {
-		if (($app !== false) === ($key !== false)) {
-			return false;
-		}
-
-		$key = ($key === false) ? '' : $key;
-		if (!$app) {
-			return $this->searchValues($key, false, self::VALUE_MIXED);
-		} else {
-			return $this->getAllValues($app, $key);
-		}
-	}
-
-	/**
-	 * get all values of the app or and filters out sensitive data
-	 *
-	 * @param string $app
-	 *
-	 * @return array
-	 * @deprecated 29.0.0 use {@see getAllValues()}
-	 */
-	public function getFilteredValues($app) {
-		return $this->getAllValues($app, filtered: true);
-	}
-
-
-	/**
-	 * **Warning:** avoid default NULL value for $lazy as this will
-	 * load all lazy values from the database
-	 *
-	 * @param string $app
-	 * @param array<string, string> $values ['key' => 'value']
-	 * @param bool|null $lazy
-	 *
-	 * @return array<string, string|int|float|bool|array>
-	 */
-	private function formatAppValues(string $app, array $values, ?bool $lazy = null): array {
-		foreach ($values as $key => $value) {
-			try {
-				$type = $this->getValueType($app, $key, $lazy);
-			} catch (AppConfigUnknownKeyException) {
-				continue;
-			}
-
-			$values[$key] = $this->convertTypedValue($value, $type);
-		}
-
-		return $values;
-	}
-
-	/**
-	 * convert string value to the expected type
-	 *
-	 * @param string $value
-	 * @param int $type
-	 *
-	 * @return string|int|float|bool|array
-	 */
-	private function convertTypedValue(string $value, int $type): string|int|float|bool|array {
-		switch ($type) {
-			case self::VALUE_INT:
-				return (int)$value;
-			case self::VALUE_FLOAT:
-				return (float)$value;
-			case self::VALUE_BOOL:
-				return in_array(strtolower($value), ['1', 'true', 'yes', 'on']);
-			case self::VALUE_ARRAY:
-				try {
-					return json_decode($value, true, flags: JSON_THROW_ON_ERROR);
-				} catch (JsonException $e) {
-					// ignoreable
-				}
-				break;
-		}
-		return $value;
-	}
-
-	/**
-	 * @param string $app
-	 *
-	 * @return string[]
-	 * @deprecated 29.0.0 data sensitivity should be set when calling setValue*()
-	 */
-	private function getSensitiveKeys(string $app): array {
-		$sensitiveValues = [
-			'circles' => [
-				'/^key_pairs$/',
-				'/^local_gskey$/',
-			],
-			'call_summary_bot' => [
-				'/^secret_(.*)$/',
-			],
-			'external' => [
-				'/^sites$/',
-				'/^jwt_token_privkey_(.*)$/',
-			],
-			'globalsiteselector' => [
-				'/^gss\.jwt\.key$/',
-			],
-			'gpgmailer' => [
-				'/^GpgServerKey$/',
-			],
-			'integration_discourse' => [
-				'/^private_key$/',
-				'/^public_key$/',
-			],
-			'integration_dropbox' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_github' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_gitlab' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^oauth_instance_url$/',
-			],
-			'integration_google' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_jira' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^forced_instance_url$/',
-			],
-			'integration_onedrive' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_openproject' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^oauth_instance_url$/',
-			],
-			'integration_reddit' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_suitecrm' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^oauth_instance_url$/',
-			],
-			'integration_twitter' => [
-				'/^consumer_key$/',
-				'/^consumer_secret$/',
-				'/^followed_user$/',
-			],
-			'integration_zammad' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^oauth_instance_url$/',
-			],
-			'maps' => [
-				'/^mapboxAPIKEY$/',
-			],
-			'notify_push' => [
-				'/^cookie$/',
-			],
-			'onlyoffice' => [
-				'/^jwt_secret$/',
-			],
-			'passwords' => [
-				'/^SSEv1ServerKey$/',
-			],
-			'serverinfo' => [
-				'/^token$/',
-			],
-			'spreed' => [
-				'/^bridge_bot_password$/',
-				'/^hosted-signaling-server-(.*)$/',
-				'/^recording_servers$/',
-				'/^signaling_servers$/',
-				'/^signaling_ticket_secret$/',
-				'/^signaling_token_privkey_(.*)$/',
-				'/^signaling_token_pubkey_(.*)$/',
-				'/^sip_bridge_dialin_info$/',
-				'/^sip_bridge_shared_secret$/',
-				'/^stun_servers$/',
-				'/^turn_servers$/',
-				'/^turn_server_secret$/',
-			],
-			'support' => [
-				'/^last_response$/',
-				'/^potential_subscription_key$/',
-				'/^subscription_key$/',
-			],
-			'theming' => [
-				'/^imprintUrl$/',
-				'/^privacyUrl$/',
-				'/^slogan$/',
-				'/^url$/',
-			],
-			'twofactor_gateway' => [
-				'/^.*token$/',
-			],
-			'user_ldap' => [
-				'/^(s..)?ldap_agent_password$/',
-			],
-			'user_saml' => [
-				'/^idp-x509cert$/',
-			],
-			'whiteboard' => [
-				'/^jwt_secret_key$/',
-			],
-		];
-
-		return $sensitiveValues[$app] ?? [];
-	}
-
-	/**
-	 * Clear all the cached app config values
-	 * New cache will be generated next time a config value is retrieved
-	 *
-	 * @deprecated 29.0.0 use {@see clearCache()}
-	 */
-	public function clearCachedConfig(): void {
-		$this->clearCache();
-	}
-
-	/**
-	 * Match and apply current use of config values with defined lexicon.
-	 * Set $lazy to NULL only if only interested into checking that $key is alias.
-	 *
-	 * @throws AppConfigUnknownKeyException
-	 * @throws AppConfigTypeConflictException
-	 * @return bool TRUE if everything is fine compared to lexicon or lexicon does not exist
-	 */
-	private function matchAndApplyLexiconDefinition(
-		string $app,
-		string &$key,
-		?bool &$lazy = null,
-		int &$type = self::VALUE_MIXED,
-		?string &$default = null,
-		?Entry &$lexiconEntry = null,
-	): bool {
-		if (in_array($key,
-			[
-				'enabled',
-				'installed_version',
-				'types',
-			])) {
-			return true; // we don't break stuff for this list of config keys.
-		}
-		$configDetails = $this->getConfigDetailsFromLexicon($app);
-		if (array_key_exists($key, $configDetails['aliases']) && !$this->ignoreLexiconAliases) {
-			// in case '$rename' is set in ConfigLexiconEntry, we use the new config key
-			$key = $configDetails['aliases'][$key];
-		}
-
-		if (!array_key_exists($key, $configDetails['entries'])) {
-			return $this->applyLexiconStrictness($configDetails['strictness'], $app . '/' . $key);
-		}
-
-		// if lazy is NULL, we ignore all check on the type/lazyness/default from Lexicon
-		if ($lazy === null) {
-			return true;
-		}
-
-		/** @var Entry $lexiconEntry */
-		$lexiconEntry = $configDetails['entries'][$key];
-		$type &= ~self::VALUE_SENSITIVE;
-
-		$appConfigValueType = $lexiconEntry->getValueType()->toAppConfigFlag();
-		if ($type === self::VALUE_MIXED) {
-			$type = $appConfigValueType; // we overwrite if value was requested as mixed
-		} elseif ($appConfigValueType !== $type) {
-			throw new AppConfigTypeConflictException('The app config key ' . $app . '/' . $key . ' is typed incorrectly in relation to the config lexicon');
-		}
-
-		$lazy = $lexiconEntry->isLazy();
-		// only look for default if needed, default from Lexicon got priority
-		if ($default !== null) {
-			$default = $lexiconEntry->getDefault($this->presetManager->getLexiconPreset()) ?? $default;
-		}
-
-		if ($lexiconEntry->isFlagged(self::FLAG_SENSITIVE)) {
-			$type |= self::VALUE_SENSITIVE;
-		}
-		if ($lexiconEntry->isDeprecated()) {
-			$this->logger->notice('App config key ' . $app . '/' . $key . ' is set as deprecated.');
-		}
-
-		return true;
-	}
-
-	/**
-	 * manage ConfigLexicon behavior based on strictness set in IConfigLexicon
-	 *
-	 * @param Strictness|null $strictness
-	 * @param string $line
-	 *
-	 * @return bool TRUE if conflict can be fully ignored, FALSE if action should be not performed
-	 * @throws AppConfigUnknownKeyException if strictness implies exception
-	 * @see \OCP\Config\Lexicon\ILexicon::getStrictness()
-	 */
-	private function applyLexiconStrictness(?Strictness $strictness, string $configAppKey): bool {
-		if ($strictness === null) {
-			return true;
-		}
-
-		$line = 'The app config key ' . $configAppKey . ' is not defined in the config lexicon';
-		switch ($strictness) {
-			case Strictness::IGNORE:
-				return true;
-			case Strictness::NOTICE:
-				if (!in_array($configAppKey, $this->strictnessApplied, true)) {
-					$this->strictnessApplied[] = $configAppKey;
-					$this->logger->notice($line);
-				}
-				return true;
-			case Strictness::WARNING:
-				if (!in_array($configAppKey, $this->strictnessApplied, true)) {
-					$this->strictnessApplied[] = $configAppKey;
-					$this->logger->warning($line);
-				}
-				return false;
-		}
-
-		throw new AppConfigUnknownKeyException($line);
-	}
-
-	/**
-	 * extract details from registered $appId's config lexicon
-	 *
-	 * @param string $appId
-	 * @internal
-	 *
-	 * @return array{entries: array<string, Entry>, aliases: array<string, string>, strictness: Strictness}
-	 */
-	public function getConfigDetailsFromLexicon(string $appId): array {
-		if (!array_key_exists($appId, $this->configLexiconDetails)) {
-			$entries = $aliases = [];
-			$bootstrapCoordinator = \OCP\Server::get(Coordinator::class);
-			$configLexicon = $bootstrapCoordinator->getRegistrationContext()?->getConfigLexicon($appId);
-			foreach ($configLexicon?->getAppConfigs() ?? [] as $configEntry) {
-				$entries[$configEntry->getKey()] = $configEntry;
-				$newName = $configEntry->getRename();
-				if ($newName !== null) {
-					$aliases[$newName] = $configEntry->getKey();
-				}
-			}
-
-			$this->configLexiconDetails[$appId] = [
-				'entries' => $entries,
-				'aliases' => $aliases,
-				'strictness' => $configLexicon?->getStrictness() ?? Strictness::IGNORE
-			];
-		}
-
-		return $this->configLexiconDetails[$appId];
-	}
-
-	/**
-	 * get Lexicon Entry using appId and config key entry
-	 *
-	 * @return Entry|null NULL if entry does not exist in app's Lexicon
-	 * @internal
-	 */
-	public function getLexiconEntry(string $appId, string $key): ?Entry {
-		return $this->getConfigDetailsFromLexicon($appId)['entries'][$key] ?? null;
-	}
-
-	/**
-	 * if set to TRUE, ignore aliases defined in Config Lexicon during the use of the methods of this class
-	 *
-	 * @internal
-	 */
-	public function ignoreLexiconAliases(bool $ignore): void {
-		$this->ignoreLexiconAliases = $ignore;
-	}
-
-	/**
-	 * Returns the installed versions of all apps
-	 *
-	 * @return array<string, string>
-	 */
-	public function getAppInstalledVersions(bool $onlyEnabled = false): array {
-		if ($this->appVersionsCache === null) {
-			/** @var array<string, string> */
-			$this->appVersionsCache = $this->searchValues('installed_version', false, IAppConfig::VALUE_STRING);
-		}
-		if ($onlyEnabled) {
-			return array_filter(
-				$this->appVersionsCache,
-				fn (string $app): bool => $this->getValueString($app, 'enabled', 'no') !== 'no',
-				ARRAY_FILTER_USE_KEY
-			);
-		}
-		return $this->appVersionsCache;
-	}
-
-	private function clearLocalCache(): void {
-		$this->localCache?->remove(self::LOCAL_CACHE_KEY);
-	}
+    private const APP_MAX_LENGTH = 32;
+    private const KEY_MAX_LENGTH = 64;
+    private const ENCRYPTION_PREFIX = '$AppConfigEncryption$';
+    private const ENCRYPTION_PREFIX_LENGTH = 21; // strlen(self::ENCRYPTION_PREFIX)
+    private const LOCAL_CACHE_KEY = 'OC\\AppConfig';
+    private const LOCAL_CACHE_TTL = 3;
+
+    /** @var array<string, array<string, string>> ['app_id' => ['config_key' => 'config_value']] */
+    private array $fastCache = [];   // cache for normal config keys
+    /** @var array<string, array<string, string>> ['app_id' => ['config_key' => 'config_value']] */
+    private array $lazyCache = [];   // cache for lazy config keys
+    /** @var array<string, array<string, int>> ['app_id' => ['config_key' => bitflag]] */
+    private array $valueTypes = [];  // type for all config values
+    private bool $fastLoaded = false;
+    private bool $lazyLoaded = false;
+    /** @var array<string, array{entries: array<string, Entry>, aliases: array<string, string>, strictness: Strictness}> ['app_id' => ['strictness' => ConfigLexiconStrictness, 'entries' => ['config_key' => ConfigLexiconEntry[]]] */
+    private array $configLexiconDetails = [];
+    private bool $ignoreLexiconAliases = false;
+    private array $strictnessApplied = [];
+
+    /** @var ?array<string, string> */
+    private ?array $appVersionsCache = null;
+    private ?ICache $localCache = null;
+
+    public function __construct(
+        protected IDBConnection $connection,
+        protected IConfig $config,
+        private readonly ConfigManager $configManager,
+        private readonly PresetManager $presetManager,
+        protected LoggerInterface $logger,
+        protected ICrypto $crypto,
+        public readonly CacheFactory $cacheFactory,
+    ) {
+        if ($config->getSystemValueBool('cache_app_config', true) && $cacheFactory->isLocalCacheAvailable()) {
+            $cacheFactory->withServerVersionPrefix(function (ICacheFactory $factory) {
+                $this->localCache = $factory->createLocal();
+            });
+        }
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @return list<string> list of app ids
+     * @since 7.0.0
+     */
+    public function getApps(): array {
+        $this->loadConfig(lazy: true);
+        $apps = array_merge(array_keys($this->fastCache), array_keys($this->lazyCache));
+        sort($apps);
+
+        return array_values(array_unique($apps));
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @return list<string> list of stored config keys
+     * @see searchKeys to not load lazy config keys
+     *
+     * @since 29.0.0
+     */
+    public function getKeys(string $app): array {
+        $this->assertParams($app);
+        $this->loadConfig($app, true);
+        $keys = array_merge(array_keys($this->fastCache[$app] ?? []), array_keys($this->lazyCache[$app] ?? []));
+        sort($keys);
+
+        return array_values(array_unique($keys));
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $prefix returns only keys starting with this value
+     * @param bool $lazy TRUE to search in lazy config keys
+     * @return list<string> list of stored config keys
+     * @since 32.0.0
+     */
+    public function searchKeys(string $app, string $prefix = '', bool $lazy = false): array {
+        $this->assertParams($app);
+        $this->loadConfig($app, $lazy);
+        if ($lazy) {
+            $keys = array_keys($this->lazyCache[$app] ?? []);
+        } else {
+            $keys = array_keys($this->fastCache[$app] ?? []);
+        }
+
+        if ($prefix !== '') {
+            $keys = array_filter($keys, static fn (string $key): bool => str_starts_with($key, $prefix));
+        }
+
+        sort($keys);
+        return array_values(array_unique($keys));
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
+     *
+     * @return bool TRUE if key exists
+     * @since 7.0.0
+     * @since 29.0.0 Added the $lazy argument
+     */
+    public function hasKey(string $app, string $key, ?bool $lazy = false): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfig($app, $lazy ?? true);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        $hasLazy = isset($this->lazyCache[$app][$key]);
+        $hasFast = isset($this->fastCache[$app][$key]);
+        if ($lazy === null) {
+            return $hasLazy || $hasFast;
+        } else {
+            return $lazy ? $hasLazy : $hasFast;
+        }
+    }
+
+    /**
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
+     *
+     * @return bool
+     * @throws AppConfigUnknownKeyException if config key is not known
+     * @since 29.0.0
+     */
+    public function isSensitive(string $app, string $key, ?bool $lazy = false): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfig(null, $lazy ?? true);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        if (!isset($this->valueTypes[$app][$key])) {
+            throw new AppConfigUnknownKeyException('unknown config key');
+        }
+
+        return $this->isTyped(self::VALUE_SENSITIVE, $this->valueTypes[$app][$key]);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app if of the app
+     * @param string $key config key
+     *
+     * @return bool TRUE if config is lazy loaded
+     * @throws AppConfigUnknownKeyException if config key is not known
+     * @see IAppConfig for details about lazy loading
+     * @since 29.0.0
+     */
+    public function isLazy(string $app, string $key): bool {
+        $this->assertParams($app, $key);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        // there is a huge probability the non-lazy config are already loaded
+        if ($this->hasKey($app, $key, false)) {
+            return false;
+        }
+
+        // key not found, we search in the lazy config
+        if ($this->hasKey($app, $key, true)) {
+            return true;
+        }
+
+        throw new AppConfigUnknownKeyException('unknown config key');
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $prefix config keys prefix to search
+     * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
+     *
+     * @return array<string, string|int|float|bool|array> [configKey => configValue]
+     * @since 29.0.0
+     */
+    public function getAllValues(string $app, string $prefix = '', bool $filtered = false): array {
+        $this->assertParams($app, $prefix);
+        // if we want to filter values, we need to get sensitivity
+        $this->loadConfig($app, true);
+        // array_merge() will remove numeric keys (here config keys), so addition arrays instead
+        $values = $this->formatAppValues($app, ($this->fastCache[$app] ?? []) + ($this->lazyCache[$app] ?? []));
+        $values = array_filter(
+            $values,
+            function (string $key) use ($prefix): bool {
+                return str_starts_with($key, $prefix); // filter values based on $prefix
+            }, ARRAY_FILTER_USE_KEY
+        );
+
+        if (!$filtered) {
+            return $values;
+        }
+
+        /**
+         * Using the old (deprecated) list of sensitive values.
+         */
+        foreach ($this->getSensitiveKeys($app) as $sensitiveKeyExp) {
+            $sensitiveKeys = preg_grep($sensitiveKeyExp, array_keys($values));
+            foreach ($sensitiveKeys as $sensitiveKey) {
+                $this->valueTypes[$app][$sensitiveKey] = ($this->valueTypes[$app][$sensitiveKey] ?? 0) | self::VALUE_SENSITIVE;
+            }
+        }
+
+        $result = [];
+        foreach ($values as $key => $value) {
+            $result[$key] = $this->isTyped(self::VALUE_SENSITIVE, $this->valueTypes[$app][$key] ?? 0) ? IConfig::SENSITIVE_VALUE : $value;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $key config key
+     * @param bool $lazy search within lazy loaded config
+     * @param int|null $typedAs enforce type for the returned values ({@see self::VALUE_STRING} and others)
+     *
+     * @return array<string, string|int|float|bool|array> [appId => configValue]
+     * @since 29.0.0
+     */
+    public function searchValues(string $key, bool $lazy = false, ?int $typedAs = null): array {
+        $this->assertParams('', $key, true);
+        $this->loadConfig(null, $lazy);
+
+        /** @var array<array-key, array<array-key, mixed>> $cache */
+        if ($lazy) {
+            $cache = $this->lazyCache;
+        } else {
+            $cache = $this->fastCache;
+        }
+
+        $values = [];
+        foreach (array_keys($cache) as $app) {
+            if (isset($cache[$app][$key])) {
+                $values[$app] = $this->convertTypedValue($cache[$app][$key], $typedAs ?? $this->getValueType((string)$app, $key, $lazy));
+            }
+        }
+
+        return $values;
+    }
+
+
+    /**
+     * Get the config value as string.
+     * If the value does not exist the given default will be returned.
+     *
+     * Set lazy to `null` to ignore it and get the value from either source.
+     *
+     * **WARNING:** Method is internal and **SHOULD** not be used, as it is better to get the value with a type.
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default config value
+     * @param null|bool $lazy get config as lazy loaded or not. can be NULL
+     *
+     * @return string the value or $default
+     * @internal
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     * @see getValueString()
+     * @see getValueInt()
+     * @see getValueFloat()
+     * @see getValueBool()
+     * @see getValueArray()
+     */
+    public function getValueMixed(
+        string $app,
+        string $key,
+        string $default = '',
+        ?bool $lazy = false,
+    ): string {
+        try {
+            $lazy = ($lazy === null) ? $this->isLazy($app, $key) : $lazy;
+        } catch (AppConfigUnknownKeyException) {
+            return $default;
+        }
+
+        return $this->getTypedValue(
+            $app,
+            $key,
+            $default,
+            $lazy,
+            self::VALUE_MIXED
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return string stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueString(
+        string $app,
+        string $key,
+        string $default = '',
+        bool $lazy = false,
+    ): string {
+        return $this->getTypedValue($app, $key, $default, $lazy, self::VALUE_STRING);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return int stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueInt(
+        string $app,
+        string $key,
+        int $default = 0,
+        bool $lazy = false,
+    ): int {
+        return (int)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_INT);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param float $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return float stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueFloat(string $app, string $key, float $default = 0, bool $lazy = false): float {
+        return (float)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_FLOAT);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return bool stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueBool(string $app, string $key, bool $default = false, bool $lazy = false): bool {
+        $b = strtolower($this->getTypedValue($app, $key, $default ? 'true' : 'false', $lazy, self::VALUE_BOOL));
+        return in_array($b, ['1', 'true', 'yes', 'on']);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param array $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return array stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueArray(
+        string $app,
+        string $key,
+        array $default = [],
+        bool $lazy = false,
+    ): array {
+        try {
+            $defaultJson = json_encode($default, JSON_THROW_ON_ERROR);
+            $value = json_decode($this->getTypedValue($app, $key, $defaultJson, $lazy, self::VALUE_ARRAY), true, flags: JSON_THROW_ON_ERROR);
+
+            return is_array($value) ? $value : [];
+        } catch (JsonException) {
+            return [];
+        }
+    }
+
+    /**
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default default value
+     * @param bool $lazy search within lazy loaded config
+     * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT}{@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
+     *
+     * @return string
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @throws InvalidArgumentException
+     */
+    private function getTypedValue(
+        string $app,
+        string $key,
+        string $default,
+        bool $lazy,
+        int $type,
+    ): string {
+        $this->assertParams($app, $key, valueType: $type);
+        $origKey = $key;
+        $matched = $this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type, $default);
+        if ($default === null) {
+            // there is no logical reason for it to be null
+            throw new \Exception('default cannot be null');
+        }
+
+        // returns default if strictness of lexicon is set to WARNING (block and report)
+        if (!$matched) {
+            return $default;
+        }
+
+        $this->loadConfig($app, $lazy ?? true);
+
+        /**
+         * We ignore check if mixed type is requested.
+         * If type of stored value is set as mixed, we don't filter.
+         * If type of stored value is defined, we compare with the one requested.
+         */
+        $knownType = $this->valueTypes[$app][$key] ?? 0;
+        if (!$this->isTyped(self::VALUE_MIXED, $type)
+            && $knownType > 0
+            && !$this->isTyped(self::VALUE_MIXED, $knownType)
+            && !$this->isTyped($type, $knownType)) {
+            $this->logger->warning('conflict with value type from database', ['app' => $app, 'key' => $key, 'type' => $type, 'knownType' => $knownType]);
+            throw new AppConfigTypeConflictException('conflict with value type from database');
+        }
+
+        /**
+         * - the pair $app/$key cannot exist in both array,
+         * - we should still return an existing non-lazy value even if current method
+         *   is called with $lazy is true
+         *
+         * This way, lazyCache will be empty until the load for lazy config value is requested.
+         */
+        if (isset($this->lazyCache[$app][$key])) {
+            $value = $this->lazyCache[$app][$key];
+        } elseif (isset($this->fastCache[$app][$key])) {
+            $value = $this->fastCache[$app][$key];
+        } else {
+            return $default;
+        }
+
+        $sensitive = $this->isTyped(self::VALUE_SENSITIVE, $knownType);
+        if ($sensitive && str_starts_with($value, self::ENCRYPTION_PREFIX)) {
+            // Only decrypt values that are stored encrypted
+            $value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
+        }
+
+        // in case the key was modified while running matchAndApplyLexiconDefinition() we are
+        // interested to check options in case a modification of the value is needed
+        // ie inverting value from previous key when using lexicon option RENAME_INVERT_BOOLEAN
+        if ($origKey !== $key && $type === self::VALUE_BOOL) {
+            $value = ($this->configManager->convertToBool($value, $this->getLexiconEntry($app, $key))) ? '1' : '0';
+        }
+
+        return $value;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @return int type of the value
+     * @throws AppConfigUnknownKeyException if config key is not known
+     * @since 29.0.0
+     * @see VALUE_STRING
+     * @see VALUE_INT
+     * @see VALUE_FLOAT
+     * @see VALUE_BOOL
+     * @see VALUE_ARRAY
+     */
+    public function getValueType(string $app, string $key, ?bool $lazy = null): int {
+        $type = self::VALUE_MIXED;
+        $ignorable = $lazy ?? false;
+        $this->matchAndApplyLexiconDefinition($app, $key, $ignorable, $type);
+        if ($type !== self::VALUE_MIXED) {
+            // a modified $type means config key is set in Lexicon
+            return $type;
+        }
+
+        $this->assertParams($app, $key);
+        $this->loadConfig($app, $lazy ?? true);
+
+        if (!isset($this->valueTypes[$app][$key])) {
+            throw new AppConfigUnknownKeyException('unknown config key');
+        }
+
+        $type = $this->valueTypes[$app][$key];
+        $type &= ~self::VALUE_SENSITIVE;
+        return $type;
+    }
+
+
+    /**
+     * Store a config key and its value in database as VALUE_MIXED
+     *
+     * **WARNING:** Method is internal and **MUST** not be used as it is best to set a real value type
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED
+     * @internal
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     * @see setValueString()
+     * @see setValueInt()
+     * @see setValueFloat()
+     * @see setValueBool()
+     * @see setValueArray()
+     */
+    public function setValueMixed(
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        return $this->setTypedValue(
+            $app,
+            $key,
+            $value,
+            $lazy,
+            self::VALUE_MIXED | ($sensitive ? self::VALUE_SENSITIVE : 0)
+        );
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueString(
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        return $this->setTypedValue(
+            $app,
+            $key,
+            $value,
+            $lazy,
+            self::VALUE_STRING | ($sensitive ? self::VALUE_SENSITIVE : 0)
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueInt(
+        string $app,
+        string $key,
+        int $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        if ($value > 2000000000) {
+            $this->logger->debug('You are trying to store an integer value around/above 2,147,483,647. This is a reminder that reaching this theoretical limit on 32 bits system will throw an exception.');
+        }
+
+        return $this->setTypedValue(
+            $app,
+            $key,
+            (string)$value,
+            $lazy,
+            self::VALUE_INT | ($sensitive ? self::VALUE_SENSITIVE : 0)
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param float $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueFloat(
+        string $app,
+        string $key,
+        float $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        return $this->setTypedValue(
+            $app,
+            $key,
+            (string)$value,
+            $lazy,
+            self::VALUE_FLOAT | ($sensitive ? self::VALUE_SENSITIVE : 0)
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $value config value
+     * @param bool $lazy set config as lazy loaded
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueBool(
+        string $app,
+        string $key,
+        bool $value,
+        bool $lazy = false,
+    ): bool {
+        return $this->setTypedValue(
+            $app,
+            $key,
+            ($value) ? '1' : '0',
+            $lazy,
+            self::VALUE_BOOL
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param array $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @throws JsonException
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueArray(
+        string $app,
+        string $key,
+        array $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        try {
+            return $this->setTypedValue(
+                $app,
+                $key,
+                json_encode($value, JSON_THROW_ON_ERROR),
+                $lazy,
+                self::VALUE_ARRAY | ($sensitive ? self::VALUE_SENSITIVE : 0)
+            );
+        } catch (JsonException $e) {
+            $this->logger->warning('could not setValueArray', ['app' => $app, 'key' => $key, 'exception' => $e]);
+            throw $e;
+        }
+    }
+
+    /**
+     * Store a config key and its value in database
+     *
+     * If config key is already known with the exact same config value and same sensitive/lazy status, the
+     * database is not updated. If config value was previously stored as sensitive, status will not be
+     * altered.
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy config set as lazy loaded
+     * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT} {@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
+     *
+     * @return bool TRUE if value was updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @see IAppConfig for explanation about lazy loading
+     */
+    private function setTypedValue(
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy,
+        int $type,
+    ): bool {
+        $this->assertParams($app, $key);
+        if (!$this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type)) {
+            return false; // returns false as database is not updated
+        }
+        $this->loadConfig(null, $lazy ?? true);
+
+        $sensitive = $this->isTyped(self::VALUE_SENSITIVE, $type);
+        $inserted = $refreshCache = false;
+
+        $origValue = $value;
+        if ($sensitive || ($this->hasKey($app, $key, $lazy) && $this->isSensitive($app, $key, $lazy))) {
+            $value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
+        }
+
+        if ($this->hasKey($app, $key, $lazy)) {
+            /**
+             * no update if key is already known with set lazy status and value is
+             * not different, unless sensitivity is switched from false to true.
+             */
+            if ($origValue === $this->getTypedValue($app, $key, $value, $lazy ?? true, $type)
+                && (!$sensitive || $this->isSensitive($app, $key, $lazy))) {
+                return false;
+            }
+        } else {
+            /**
+             * if key is not known yet, we try to insert.
+             * It might fail if the key exists with a different lazy flag.
+             */
+            try {
+                $insert = $this->connection->getQueryBuilder();
+                $insert->insert('appconfig')
+                    ->setValue('appid', $insert->createNamedParameter($app))
+                    ->setValue('lazy', $insert->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
+                    ->setValue('type', $insert->createNamedParameter($type, IQueryBuilder::PARAM_INT))
+                    ->setValue('configkey', $insert->createNamedParameter($key))
+                    ->setValue('configvalue', $insert->createNamedParameter($value));
+                $insert->executeStatement();
+                $inserted = true;
+            } catch (DBException $e) {
+                if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                    throw $e; // TODO: throw exception or just log and returns false !?
+                }
+            }
+        }
+
+        /**
+         * We cannot insert a new row, meaning we need to update an already existing one
+         */
+        if (!$inserted) {
+            $currType = $this->valueTypes[$app][$key] ?? 0;
+            if ($currType === 0) { // this might happen when switching lazy loading status
+                $this->loadConfig(lazy: true);
+                $currType = $this->valueTypes[$app][$key] ?? 0;
+            }
+
+            /**
+             * This should only happen during the upgrade process from 28 to 29.
+             * We only log a warning and set it to VALUE_MIXED.
+             */
+            if ($currType === 0) {
+                $this->logger->warning('Value type is set to zero (0) in database. This is fine only during the upgrade process from 28 to 29.', ['app' => $app, 'key' => $key]);
+                $currType = self::VALUE_MIXED;
+            }
+
+            /**
+             * we only accept a different type from the one stored in database
+             * if the one stored in database is not-defined (VALUE_MIXED)
+             */
+            if (!$this->isTyped(self::VALUE_MIXED, $currType)
+                && ($type | self::VALUE_SENSITIVE) !== ($currType | self::VALUE_SENSITIVE)) {
+                try {
+                    $currType = $this->convertTypeToString($currType);
+                    $type = $this->convertTypeToString($type);
+                } catch (AppConfigIncorrectTypeException) {
+                    // can be ignored, this was just needed for a better exception message.
+                }
+                throw new AppConfigTypeConflictException('conflict between new type (' . $type . ') and old type (' . $currType . ')');
+            }
+
+            // we fix $type if the stored value, or the new value as it might be changed, is set as sensitive
+            if ($sensitive || $this->isTyped(self::VALUE_SENSITIVE, $currType)) {
+                $type |= self::VALUE_SENSITIVE;
+            }
+
+            try {
+                if ($lazy !== $this->isLazy($app, $key)) {
+                    $refreshCache = true;
+                }
+            } catch (AppConfigUnknownKeyException) {
+                // pass
+            }
+
+            $update = $this->connection->getQueryBuilder();
+            $update->update('appconfig')
+                ->set('configvalue', $update->createNamedParameter($value))
+                ->set('lazy', $update->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
+                ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
+                ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+                ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+
+            $update->executeStatement();
+        }
+
+        if ($refreshCache) {
+            $this->clearCache();
+            return true;
+        }
+
+        // update local cache
+        if ($lazy) {
+            $this->lazyCache[$app][$key] = $value;
+        } else {
+            $this->fastCache[$app][$key] = $value;
+        }
+        $this->valueTypes[$app][$key] = $type;
+        $this->clearLocalCache();
+
+        return true;
+    }
+
+    /**
+     * Change the type of config value.
+     *
+     * **WARNING:** Method is internal and **MUST** not be used as it may break things.
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT} {@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
+     *
+     * @return bool TRUE if database update were necessary
+     * @throws AppConfigUnknownKeyException if $key is now known in database
+     * @throws AppConfigIncorrectTypeException if $type is not valid
+     * @internal
+     * @since 29.0.0
+     */
+    public function updateType(string $app, string $key, int $type = self::VALUE_MIXED): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfig(lazy: true);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+        $this->isLazy($app, $key); // confirm key exists
+
+        // type can only be one type
+        if (!in_array($type, [self::VALUE_MIXED, self::VALUE_STRING, self::VALUE_INT, self::VALUE_FLOAT, self::VALUE_BOOL, self::VALUE_ARRAY])) {
+            throw new AppConfigIncorrectTypeException('Unknown value type');
+        }
+
+        $currType = $this->valueTypes[$app][$key];
+        if (($type | self::VALUE_SENSITIVE) === ($currType | self::VALUE_SENSITIVE)) {
+            return false;
+        }
+
+        // we complete with sensitive flag if the stored value is set as sensitive
+        if ($this->isTyped(self::VALUE_SENSITIVE, $currType)) {
+            $type = $type | self::VALUE_SENSITIVE;
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('appconfig')
+            ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
+            ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+        $this->valueTypes[$app][$key] = $type;
+
+        return true;
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $sensitive TRUE to set as sensitive, FALSE to unset
+     *
+     * @return bool TRUE if entry was found in database and an update was necessary
+     * @since 29.0.0
+     */
+    public function updateSensitive(string $app, string $key, bool $sensitive): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfig(lazy: true);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        try {
+            if ($sensitive === $this->isSensitive($app, $key, null)) {
+                return false;
+            }
+        } catch (AppConfigUnknownKeyException $e) {
+            return false;
+        }
+
+        $lazy = $this->isLazy($app, $key);
+        if ($lazy) {
+            $cache = $this->lazyCache;
+        } else {
+            $cache = $this->fastCache;
+        }
+
+        if (!isset($cache[$app][$key])) {
+            throw new AppConfigUnknownKeyException('unknown config key');
+        }
+
+        /**
+         * type returned by getValueType() is already cleaned from sensitive flag
+         * we just need to update it based on $sensitive and store it in database
+         */
+        $type = $this->getValueType($app, $key);
+        $value = $cache[$app][$key];
+        if ($sensitive) {
+            $type |= self::VALUE_SENSITIVE;
+            $value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
+        } else {
+            $value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('appconfig')
+            ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
+            ->set('configvalue', $update->createNamedParameter($value))
+            ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        $this->valueTypes[$app][$key] = $type;
+
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $lazy TRUE to set as lazy loaded, FALSE to unset
+     *
+     * @return bool TRUE if entry was found in database and an update was necessary
+     * @since 29.0.0
+     */
+    public function updateLazy(string $app, string $key, bool $lazy): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfig(lazy: true);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        try {
+            if ($lazy === $this->isLazy($app, $key)) {
+                return false;
+            }
+        } catch (AppConfigUnknownKeyException $e) {
+            return false;
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('appconfig')
+            ->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT))
+            ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        // At this point, it is a lot safer to clean cache
+        $this->clearCache();
+
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @return array
+     * @throws AppConfigUnknownKeyException if config key is not known in database
+     * @since 29.0.0
+     */
+    public function getDetails(string $app, string $key): array {
+        $this->assertParams($app, $key);
+        $this->loadConfig(lazy: true);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+        $lazy = $this->isLazy($app, $key);
+
+        if ($lazy) {
+            $cache = $this->lazyCache;
+        } else {
+            $cache = $this->fastCache;
+        }
+
+        $type = $this->getValueType($app, $key);
+        try {
+            $typeString = $this->convertTypeToString($type);
+        } catch (AppConfigIncorrectTypeException $e) {
+            $this->logger->warning('type stored in database is not correct', ['exception' => $e, 'type' => $type]);
+            $typeString = (string)$type;
+        }
+
+        if (!isset($cache[$app][$key])) {
+            throw new AppConfigUnknownKeyException('unknown config key');
+        }
+
+        $value = $cache[$app][$key];
+        $sensitive = $this->isSensitive($app, $key, null);
+        if ($sensitive && str_starts_with($value, self::ENCRYPTION_PREFIX)) {
+            $value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
+        }
+
+        return [
+            'app' => $app,
+            'key' => $key,
+            'value' => $value,
+            'type' => $type,
+            'lazy' => $lazy,
+            'typeString' => $typeString,
+            'sensitive' => $sensitive
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @return array{app: string, key: string, lazy?: bool, valueType?: ValueType, valueTypeName?: string, sensitive?: bool, internal?: bool, default?: string, definition?: string, note?: string}
+     * @since 32.0.0
+     */
+    public function getKeyDetails(string $app, string $key): array {
+        $this->assertParams($app, $key);
+        try {
+            $details = $this->getDetails($app, $key);
+        } catch (AppConfigUnknownKeyException) {
+            $details = [
+                'app' => $app,
+                'key' => $key
+            ];
+        }
+
+        /** @var Entry $lexiconEntry */
+        try {
+            $lazy = false;
+            $this->matchAndApplyLexiconDefinition($app, $key, $lazy, lexiconEntry: $lexiconEntry);
+        } catch (AppConfigTypeConflictException|AppConfigUnknownKeyException) {
+            // can be ignored
+        }
+
+        if ($lexiconEntry !== null) {
+            $details = array_merge($details, [
+                'lazy' => $lexiconEntry->isLazy(),
+                'valueType' => $lexiconEntry->getValueType(),
+                'valueTypeName' => $lexiconEntry->getValueType()->name,
+                'sensitive' => $lexiconEntry->isFlagged(self::FLAG_SENSITIVE),
+                'internal' => $lexiconEntry->isFlagged(self::FLAG_INTERNAL),
+                'default' => $lexiconEntry->getDefault($this->presetManager->getLexiconPreset()),
+                'definition' => $lexiconEntry->getDefinition(),
+                'note' => $lexiconEntry->getNote(),
+            ]);
+        }
+
+        return array_filter($details, static fn ($v): bool => ($v !== null));
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return int
+     * @throws AppConfigIncorrectTypeException
+     * @since 29.0.0
+     */
+    public function convertTypeToInt(string $type): int {
+        return match (strtolower($type)) {
+            'mixed' => IAppConfig::VALUE_MIXED,
+            'string' => IAppConfig::VALUE_STRING,
+            'integer' => IAppConfig::VALUE_INT,
+            'float' => IAppConfig::VALUE_FLOAT,
+            'boolean' => IAppConfig::VALUE_BOOL,
+            'array' => IAppConfig::VALUE_ARRAY,
+            default => throw new AppConfigIncorrectTypeException('Unknown type ' . $type)
+        };
+    }
+
+    /**
+     * @param int $type
+     *
+     * @return string
+     * @throws AppConfigIncorrectTypeException
+     * @since 29.0.0
+     */
+    public function convertTypeToString(int $type): string {
+        $type &= ~self::VALUE_SENSITIVE;
+
+        return match ($type) {
+            IAppConfig::VALUE_MIXED => 'mixed',
+            IAppConfig::VALUE_STRING => 'string',
+            IAppConfig::VALUE_INT => 'integer',
+            IAppConfig::VALUE_FLOAT => 'float',
+            IAppConfig::VALUE_BOOL => 'boolean',
+            IAppConfig::VALUE_ARRAY => 'array',
+            default => throw new AppConfigIncorrectTypeException('Unknown numeric type ' . $type)
+        };
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @since 29.0.0
+     */
+    public function deleteKey(string $app, string $key): void {
+        $this->assertParams($app, $key);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('appconfig')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
+            ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
+        $qb->executeStatement();
+
+        unset($this->lazyCache[$app][$key]);
+        unset($this->fastCache[$app][$key]);
+        unset($this->valueTypes[$app][$key]);
+        $this->clearLocalCache();
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     *
+     * @since 29.0.0
+     */
+    public function deleteApp(string $app): void {
+        $this->assertParams($app);
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('appconfig')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)));
+        $qb->executeStatement();
+
+        $this->clearCache();
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param bool $reload set to TRUE to refill cache instantly after clearing it
+     *
+     * @internal
+     * @since 29.0.0
+     */
+    public function clearCache(bool $reload = false): void {
+        $this->lazyLoaded = $this->fastLoaded = false;
+        $this->lazyCache = $this->fastCache = $this->valueTypes = $this->configLexiconDetails = [];
+        $this->localCache?->remove(self::LOCAL_CACHE_KEY);
+
+        if (!$reload) {
+            return;
+        }
+
+        $this->loadConfig(lazy: true);
+    }
+
+
+    /**
+     * For debug purpose.
+     * Returns the cached data.
+     *
+     * @return array
+     * @since 29.0.0
+     * @internal
+     */
+    public function statusCache(): array {
+        return [
+            'fastLoaded' => $this->fastLoaded,
+            'fastCache' => $this->fastCache,
+            'lazyLoaded' => $this->lazyLoaded,
+            'lazyCache' => $this->lazyCache,
+        ];
+    }
+
+    /**
+     * @param int $needle bitflag to search
+     * @param int $type known value
+     *
+     * @return bool TRUE if bitflag $needle is set in $type
+     */
+    private function isTyped(int $needle, int $type): bool {
+        return (($needle & $type) !== 0);
+    }
+
+    /**
+     * Confirm the string set for app and key fit the database description
+     *
+     * @param string $app assert $app fit in database
+     * @param string $configKey assert config key fit in database
+     * @param bool $allowEmptyApp $app can be empty string
+     * @param int $valueType assert value type is only one type
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertParams(string $app = '', string $configKey = '', bool $allowEmptyApp = false, int $valueType = -1): void {
+        if (!$allowEmptyApp && $app === '') {
+            throw new InvalidArgumentException('app cannot be an empty string');
+        }
+        if (strlen($app) > self::APP_MAX_LENGTH) {
+            throw new InvalidArgumentException(
+                'Value (' . $app . ') for app is too long (' . self::APP_MAX_LENGTH . ')'
+            );
+        }
+        if (strlen($configKey) > self::KEY_MAX_LENGTH) {
+            throw new InvalidArgumentException('Value (' . $configKey . ') for key is too long (' . self::KEY_MAX_LENGTH . ')');
+        }
+        if ($valueType > -1) {
+            $valueType &= ~self::VALUE_SENSITIVE;
+            if (!in_array($valueType, [self::VALUE_MIXED, self::VALUE_STRING, self::VALUE_INT, self::VALUE_FLOAT, self::VALUE_BOOL, self::VALUE_ARRAY])) {
+                throw new InvalidArgumentException('Unknown value type');
+            }
+        }
+    }
+
+    /**
+     * Load normal config or config set as lazy loaded
+     *
+     * @param bool $lazy set to TRUE to also load config values set as lazy loaded
+     */
+    private function loadConfig(?string $app = null, bool $lazy = false): void {
+        if ($this->isLoaded($lazy)) {
+            return;
+        }
+
+        // if lazy is null or true, we debug log
+        if ($lazy === true && $app !== null) {
+            $exception = new \RuntimeException('The loading of lazy AppConfig values have been triggered by app "' . $app . '"');
+            $this->logger->debug($exception->getMessage(), ['exception' => $exception, 'app' => $app]);
+        }
+
+        $loadLazyOnly = $lazy && $this->isLoaded();
+
+        /** @var array<mixed> */
+        $cacheContent = $this->localCache?->get(self::LOCAL_CACHE_KEY) ?? [];
+        $includesLazyValues = !empty($cacheContent) && !empty($cacheContent['lazyCache']);
+        if (!empty($cacheContent) && (!$lazy || $includesLazyValues)) {
+            $this->valueTypes = $cacheContent['valueTypes'];
+            $this->fastCache = $cacheContent['fastCache'];
+            $this->fastLoaded = !empty($this->fastCache);
+            if ($includesLazyValues) {
+                $this->lazyCache = $cacheContent['lazyCache'];
+                $this->lazyLoaded = !empty($this->lazyCache);
+            }
+            return;
+        }
+
+        // Otherwise no cache available and we need to fetch from database
+        $qb = $this->connection->getQueryBuilder();
+        $qb->from('appconfig')
+            ->select('appid', 'configkey', 'configvalue', 'type');
+
+        if ($lazy === false) {
+            $qb->where($qb->expr()->eq('lazy', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+        } else {
+            if ($loadLazyOnly) {
+                $qb->where($qb->expr()->eq('lazy', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
+            }
+            $qb->addSelect('lazy');
+        }
+
+        $result = $qb->executeQuery();
+        $rows = $result->fetchAll();
+        foreach ($rows as $row) {
+            // most of the time, 'lazy' is not in the select because its value is already known
+            if ($lazy && ((int)$row['lazy']) === 1) {
+                $this->lazyCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
+            } else {
+                $this->fastCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
+            }
+            $this->valueTypes[$row['appid']][$row['configkey']] = (int)($row['type'] ?? 0);
+        }
+
+        $result->closeCursor();
+        $this->localCache?->set(
+            self::LOCAL_CACHE_KEY,
+            [
+                'fastCache' => $this->fastCache,
+                'lazyCache' => $this->lazyCache,
+                'valueTypes' => $this->valueTypes,
+            ],
+            self::LOCAL_CACHE_TTL,
+        );
+
+        $this->fastLoaded = true;
+        $this->lazyLoaded = $lazy;
+    }
+
+    /**
+     * @param bool $lazy - If set to true then also check if lazy values are loaded
+     */
+    private function isLoaded(bool $lazy = false): bool {
+        return $this->fastLoaded && (!$lazy || $this->lazyLoaded);
+    }
+
+    /**
+     * Gets the config value
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string $default - Default value if the key does not exist
+     *
+     * @return string the value or $default
+     * @deprecated 29.0.0 use getValue*()
+     *
+     * This function gets a value from the appconfig table. If the key does
+     * not exist the default value will be returned
+     */
+    public function getValue($app, $key, $default = '') {
+        $this->loadConfig($app);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        return $this->fastCache[$app][$key] ?? $default;
+    }
+
+    /**
+     * Sets a value. If the key did not exist before it will be created.
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string|float|int $value value
+     *
+     * @return bool True if the value was inserted or updated, false if the value was the same
+     * @throws AppConfigTypeConflictException
+     * @throws AppConfigUnknownKeyException
+     * @deprecated 29.0.0
+     */
+    public function setValue($app, $key, $value) {
+        /**
+         * TODO: would it be overkill, or decently improve performance, to catch
+         * call to this method with $key='enabled' and 'hide' config value related
+         * to $app when the app is disabled (by modifying entry in database: lazy=lazy+2)
+         * or enabled (lazy=lazy-2)
+         *
+         * this solution would remove the loading of config values from disabled app
+         * unless calling the method.
+         */
+        return $this->setTypedValue($app, $key, (string)$value, false, self::VALUE_MIXED);
+    }
+
+
+    /**
+     * get multiple values, either the app or key can be used as wildcard by setting it to false
+     *
+     * @param string|false $app
+     * @param string|false $key
+     *
+     * @return array|false
+     * @deprecated 29.0.0 use {@see getAllValues()}
+     */
+    public function getValues($app, $key) {
+        if (($app !== false) === ($key !== false)) {
+            return false;
+        }
+
+        $key = ($key === false) ? '' : $key;
+        if (!$app) {
+            return $this->searchValues($key, false, self::VALUE_MIXED);
+        } else {
+            return $this->getAllValues($app, $key);
+        }
+    }
+
+    /**
+     * get all values of the app or and filters out sensitive data
+     *
+     * @param string $app
+     *
+     * @return array
+     * @deprecated 29.0.0 use {@see getAllValues()}
+     */
+    public function getFilteredValues($app) {
+        return $this->getAllValues($app, filtered: true);
+    }
+
+
+    /**
+     * **Warning:** avoid default NULL value for $lazy as this will
+     * load all lazy values from the database
+     *
+     * @param string $app
+     * @param array<string, string> $values ['key' => 'value']
+     * @param bool|null $lazy
+     *
+     * @return array<string, string|int|float|bool|array>
+     */
+    private function formatAppValues(string $app, array $values, ?bool $lazy = null): array {
+        foreach ($values as $key => $value) {
+            try {
+                $type = $this->getValueType($app, $key, $lazy);
+            } catch (AppConfigUnknownKeyException) {
+                continue;
+            }
+
+            $values[$key] = $this->convertTypedValue($value, $type);
+        }
+
+        return $values;
+    }
+
+    /**
+     * convert string value to the expected type
+     *
+     * @param string $value
+     * @param int $type
+     *
+     * @return string|int|float|bool|array
+     */
+    private function convertTypedValue(string $value, int $type): string|int|float|bool|array {
+        switch ($type) {
+            case self::VALUE_INT:
+                return (int)$value;
+            case self::VALUE_FLOAT:
+                return (float)$value;
+            case self::VALUE_BOOL:
+                return in_array(strtolower($value), ['1', 'true', 'yes', 'on']);
+            case self::VALUE_ARRAY:
+                try {
+                    return json_decode($value, true, flags: JSON_THROW_ON_ERROR);
+                } catch (JsonException $e) {
+                    // ignoreable
+                }
+                break;
+        }
+        return $value;
+    }
+
+    /**
+     * @param string $app
+     *
+     * @return string[]
+     * @deprecated 29.0.0 data sensitivity should be set when calling setValue*()
+     */
+    private function getSensitiveKeys(string $app): array {
+        $sensitiveValues = [
+            'circles' => [
+                '/^key_pairs$/',
+                '/^local_gskey$/',
+            ],
+            'call_summary_bot' => [
+                '/^secret_(.*)$/',
+            ],
+            'external' => [
+                '/^sites$/',
+                '/^jwt_token_privkey_(.*)$/',
+            ],
+            'globalsiteselector' => [
+                '/^gss\.jwt\.key$/',
+            ],
+            'gpgmailer' => [
+                '/^GpgServerKey$/',
+            ],
+            'integration_discourse' => [
+                '/^private_key$/',
+                '/^public_key$/',
+            ],
+            'integration_dropbox' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_github' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_gitlab' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^oauth_instance_url$/',
+            ],
+            'integration_google' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_jira' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^forced_instance_url$/',
+            ],
+            'integration_onedrive' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_openproject' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^oauth_instance_url$/',
+            ],
+            'integration_reddit' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_suitecrm' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^oauth_instance_url$/',
+            ],
+            'integration_twitter' => [
+                '/^consumer_key$/',
+                '/^consumer_secret$/',
+                '/^followed_user$/',
+            ],
+            'integration_zammad' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^oauth_instance_url$/',
+            ],
+            'maps' => [
+                '/^mapboxAPIKEY$/',
+            ],
+            'notify_push' => [
+                '/^cookie$/',
+            ],
+            'onlyoffice' => [
+                '/^jwt_secret$/',
+            ],
+            'passwords' => [
+                '/^SSEv1ServerKey$/',
+            ],
+            'serverinfo' => [
+                '/^token$/',
+            ],
+            'spreed' => [
+                '/^bridge_bot_password$/',
+                '/^hosted-signaling-server-(.*)$/',
+                '/^recording_servers$/',
+                '/^signaling_servers$/',
+                '/^signaling_ticket_secret$/',
+                '/^signaling_token_privkey_(.*)$/',
+                '/^signaling_token_pubkey_(.*)$/',
+                '/^sip_bridge_dialin_info$/',
+                '/^sip_bridge_shared_secret$/',
+                '/^stun_servers$/',
+                '/^turn_servers$/',
+                '/^turn_server_secret$/',
+            ],
+            'support' => [
+                '/^last_response$/',
+                '/^potential_subscription_key$/',
+                '/^subscription_key$/',
+            ],
+            'theming' => [
+                '/^imprintUrl$/',
+                '/^privacyUrl$/',
+                '/^slogan$/',
+                '/^url$/',
+            ],
+            'twofactor_gateway' => [
+                '/^.*token$/',
+            ],
+            'user_ldap' => [
+                '/^(s..)?ldap_agent_password$/',
+            ],
+            'user_saml' => [
+                '/^idp-x509cert$/',
+            ],
+            'whiteboard' => [
+                '/^jwt_secret_key$/',
+            ],
+        ];
+
+        return $sensitiveValues[$app] ?? [];
+    }
+
+    /**
+     * Clear all the cached app config values
+     * New cache will be generated next time a config value is retrieved
+     *
+     * @deprecated 29.0.0 use {@see clearCache()}
+     */
+    public function clearCachedConfig(): void {
+        $this->clearCache();
+    }
+
+    /**
+     * Match and apply current use of config values with defined lexicon.
+     * Set $lazy to NULL only if only interested into checking that $key is alias.
+     *
+     * @throws AppConfigUnknownKeyException
+     * @throws AppConfigTypeConflictException
+     * @return bool TRUE if everything is fine compared to lexicon or lexicon does not exist
+     */
+    private function matchAndApplyLexiconDefinition(
+        string $app,
+        string &$key,
+        ?bool &$lazy = null,
+        int &$type = self::VALUE_MIXED,
+        ?string &$default = null,
+        ?Entry &$lexiconEntry = null,
+    ): bool {
+        if (in_array($key,
+            [
+                'enabled',
+                'installed_version',
+                'types',
+            ])) {
+            return true; // we don't break stuff for this list of config keys.
+        }
+        $configDetails = $this->getConfigDetailsFromLexicon($app);
+        if (array_key_exists($key, $configDetails['aliases']) && !$this->ignoreLexiconAliases) {
+            // in case '$rename' is set in ConfigLexiconEntry, we use the new config key
+            $key = $configDetails['aliases'][$key];
+        }
+
+        if (!array_key_exists($key, $configDetails['entries'])) {
+            return $this->applyLexiconStrictness($configDetails['strictness'], $app . '/' . $key);
+        }
+
+        // if lazy is NULL, we ignore all check on the type/lazyness/default from Lexicon
+        if ($lazy === null) {
+            return true;
+        }
+
+        /** @var Entry $lexiconEntry */
+        $lexiconEntry = $configDetails['entries'][$key];
+        $type &= ~self::VALUE_SENSITIVE;
+
+        $appConfigValueType = $lexiconEntry->getValueType()->toAppConfigFlag();
+        if ($type === self::VALUE_MIXED) {
+            $type = $appConfigValueType; // we overwrite if value was requested as mixed
+        } elseif ($appConfigValueType !== $type) {
+            throw new AppConfigTypeConflictException('The app config key ' . $app . '/' . $key . ' is typed incorrectly in relation to the config lexicon');
+        }
+
+        $lazy = $lexiconEntry->isLazy();
+        // only look for default if needed, default from Lexicon got priority
+        if ($default !== null) {
+            $default = $lexiconEntry->getDefault($this->presetManager->getLexiconPreset()) ?? $default;
+        }
+
+        if ($lexiconEntry->isFlagged(self::FLAG_SENSITIVE)) {
+            $type |= self::VALUE_SENSITIVE;
+        }
+        if ($lexiconEntry->isDeprecated()) {
+            $this->logger->notice('App config key ' . $app . '/' . $key . ' is set as deprecated.');
+        }
+
+        return true;
+    }
+
+    /**
+     * manage ConfigLexicon behavior based on strictness set in IConfigLexicon
+     *
+     * @param Strictness|null $strictness
+     * @param string $line
+     *
+     * @return bool TRUE if conflict can be fully ignored, FALSE if action should be not performed
+     * @throws AppConfigUnknownKeyException if strictness implies exception
+     * @see \OCP\Config\Lexicon\ILexicon::getStrictness()
+     */
+    private function applyLexiconStrictness(?Strictness $strictness, string $configAppKey): bool {
+        if ($strictness === null) {
+            return true;
+        }
+
+        $line = 'The app config key ' . $configAppKey . ' is not defined in the config lexicon';
+        switch ($strictness) {
+            case Strictness::IGNORE:
+                return true;
+            case Strictness::NOTICE:
+                if (!in_array($configAppKey, $this->strictnessApplied, true)) {
+                    $this->strictnessApplied[] = $configAppKey;
+                    $this->logger->notice($line);
+                }
+                return true;
+            case Strictness::WARNING:
+                if (!in_array($configAppKey, $this->strictnessApplied, true)) {
+                    $this->strictnessApplied[] = $configAppKey;
+                    $this->logger->warning($line);
+                }
+                return false;
+        }
+
+        throw new AppConfigUnknownKeyException($line);
+    }
+
+    /**
+     * extract details from registered $appId's config lexicon
+     *
+     * @param string $appId
+     * @internal
+     *
+     * @return array{entries: array<string, Entry>, aliases: array<string, string>, strictness: Strictness}
+     */
+    public function getConfigDetailsFromLexicon(string $appId): array {
+        if (!array_key_exists($appId, $this->configLexiconDetails)) {
+            $entries = $aliases = [];
+            $bootstrapCoordinator = \OCP\Server::get(Coordinator::class);
+            $configLexicon = $bootstrapCoordinator->getRegistrationContext()?->getConfigLexicon($appId);
+            foreach ($configLexicon?->getAppConfigs() ?? [] as $configEntry) {
+                $entries[$configEntry->getKey()] = $configEntry;
+                $newName = $configEntry->getRename();
+                if ($newName !== null) {
+                    $aliases[$newName] = $configEntry->getKey();
+                }
+            }
+
+            $this->configLexiconDetails[$appId] = [
+                'entries' => $entries,
+                'aliases' => $aliases,
+                'strictness' => $configLexicon?->getStrictness() ?? Strictness::IGNORE
+            ];
+        }
+
+        return $this->configLexiconDetails[$appId];
+    }
+
+    /**
+     * get Lexicon Entry using appId and config key entry
+     *
+     * @return Entry|null NULL if entry does not exist in app's Lexicon
+     * @internal
+     */
+    public function getLexiconEntry(string $appId, string $key): ?Entry {
+        return $this->getConfigDetailsFromLexicon($appId)['entries'][$key] ?? null;
+    }
+
+    /**
+     * if set to TRUE, ignore aliases defined in Config Lexicon during the use of the methods of this class
+     *
+     * @internal
+     */
+    public function ignoreLexiconAliases(bool $ignore): void {
+        $this->ignoreLexiconAliases = $ignore;
+    }
+
+    /**
+     * Returns the installed versions of all apps
+     *
+     * @return array<string, string>
+     */
+    public function getAppInstalledVersions(bool $onlyEnabled = false): array {
+        if ($this->appVersionsCache === null) {
+            /** @var array<string, string> */
+            $this->appVersionsCache = $this->searchValues('installed_version', false, IAppConfig::VALUE_STRING);
+        }
+        if ($onlyEnabled) {
+            return array_filter(
+                $this->appVersionsCache,
+                fn (string $app): bool => $this->getValueString($app, 'enabled', 'no') !== 'no',
+                ARRAY_FILTER_USE_KEY
+            );
+        }
+        return $this->appVersionsCache;
+    }
+
+    private function clearLocalCache(): void {
+        $this->localCache?->remove(self::LOCAL_CACHE_KEY);
+    }
 }

Spacing +31 added lines, -31 removed lines

@@ -59,11 +59,11 @@ 
 	private const LOCAL_CACHE_TTL = 3;
 
 	/** @var array<string, array<string, string>> ['app_id' => ['config_key' => 'config_value']] */
-	private array $fastCache = [];   // cache for normal config keys
+	private array $fastCache = []; // cache for normal config keys
 	/** @var array<string, array<string, string>> ['app_id' => ['config_key' => 'config_value']] */
-	private array $lazyCache = [];   // cache for lazy config keys
+	private array $lazyCache = []; // cache for lazy config keys
 	/** @var array<string, array<string, int>> ['app_id' => ['config_key' => bitflag]] */
-	private array $valueTypes = [];  // type for all config values
+	private array $valueTypes = []; // type for all config values
 	private bool $fastLoaded = false;
 	private bool $lazyLoaded = false;
 	/** @var array<string, array{entries: array<string, Entry>, aliases: array<string, string>, strictness: Strictness}> ['app_id' => ['strictness' => ConfigLexiconStrictness, 'entries' => ['config_key' => ConfigLexiconEntry[]]] */
@@ -85,7 +85,7 @@ 
 		public readonly CacheFactory $cacheFactory,
 	) {
 		if ($config->getSystemValueBool('cache_app_config', true) && $cacheFactory->isLocalCacheAvailable()) {
-			$cacheFactory->withServerVersionPrefix(function (ICacheFactory $factory) {
+			$cacheFactory->withServerVersionPrefix(function(ICacheFactory $factory) {
 				$this->localCache = $factory->createLocal();
 			});
 		}
@@ -242,7 +242,7 @@ 
 		$values = $this->formatAppValues($app, ($this->fastCache[$app] ?? []) + ($this->lazyCache[$app] ?? []));
 		$values = array_filter(
 			$values,
-			function (string $key) use ($prefix): bool {
+			function(string $key) use ($prefix): bool {
 				return str_starts_with($key, $prefix); // filter values based on $prefix
 			}, ARRAY_FILTER_USE_KEY
 		);
@@ -293,7 +293,7 @@ 
 		$values = [];
 		foreach (array_keys($cache) as $app) {
 			if (isset($cache[$app][$key])) {
-				$values[$app] = $this->convertTypedValue($cache[$app][$key], $typedAs ?? $this->getValueType((string)$app, $key, $lazy));
+				$values[$app] = $this->convertTypedValue($cache[$app][$key], $typedAs ?? $this->getValueType((string) $app, $key, $lazy));
 			}
 		}
 
@@ -388,7 +388,7 @@ 
 		int $default = 0,
 		bool $lazy = false,
 	): int {
-		return (int)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_INT);
+		return (int) $this->getTypedValue($app, $key, (string) $default, $lazy, self::VALUE_INT);
 	}
 
 	/**
@@ -406,7 +406,7 @@ 
 	 * @see IAppConfig for explanation about lazy loading
 	 */
 	public function getValueFloat(string $app, string $key, float $default = 0, bool $lazy = false): float {
-		return (float)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_FLOAT);
+		return (float) $this->getTypedValue($app, $key, (string) $default, $lazy, self::VALUE_FLOAT);
 	}
 
 	/**
@@ -670,7 +670,7 @@ 
 		return $this->setTypedValue(
 			$app,
 			$key,
-			(string)$value,
+			(string) $value,
 			$lazy,
 			self::VALUE_INT | ($sensitive ? self::VALUE_SENSITIVE : 0)
 		);
@@ -700,7 +700,7 @@ 
 		return $this->setTypedValue(
 			$app,
 			$key,
-			(string)$value,
+			(string) $value,
 			$lazy,
 			self::VALUE_FLOAT | ($sensitive ? self::VALUE_SENSITIVE : 0)
 		);
@@ -805,7 +805,7 @@ 
 
 		$origValue = $value;
 		if ($sensitive || ($this->hasKey($app, $key, $lazy) && $this->isSensitive($app, $key, $lazy))) {
-			$value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
+			$value = self::ENCRYPTION_PREFIX.$this->crypto->encrypt($value);
 		}
 
 		if ($this->hasKey($app, $key, $lazy)) {
@@ -870,7 +870,7 @@ 
 				} catch (AppConfigIncorrectTypeException) {
 					// can be ignored, this was just needed for a better exception message.
 				}
-				throw new AppConfigTypeConflictException('conflict between new type (' . $type . ') and old type (' . $currType . ')');
+				throw new AppConfigTypeConflictException('conflict between new type ('.$type.') and old type ('.$currType.')');
 			}
 
 			// we fix $type if the stored value, or the new value as it might be changed, is set as sensitive
@@ -1004,7 +1004,7 @@ 
 		$value = $cache[$app][$key];
 		if ($sensitive) {
 			$type |= self::VALUE_SENSITIVE;
-			$value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
+			$value = self::ENCRYPTION_PREFIX.$this->crypto->encrypt($value);
 		} else {
 			$value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
 		}
@@ -1085,7 +1085,7 @@ 
 			$typeString = $this->convertTypeToString($type);
 		} catch (AppConfigIncorrectTypeException $e) {
 			$this->logger->warning('type stored in database is not correct', ['exception' => $e, 'type' => $type]);
-			$typeString = (string)$type;
+			$typeString = (string) $type;
 		}
 
 		if (!isset($cache[$app][$key])) {
@@ -1133,7 +1133,7 @@ 
 		try {
 			$lazy = false;
 			$this->matchAndApplyLexiconDefinition($app, $key, $lazy, lexiconEntry: $lexiconEntry);
-		} catch (AppConfigTypeConflictException|AppConfigUnknownKeyException) {
+		} catch (AppConfigTypeConflictException | AppConfigUnknownKeyException) {
 			// can be ignored
 		}
 
@@ -1168,7 +1168,7 @@ 
 			'float' => IAppConfig::VALUE_FLOAT,
 			'boolean' => IAppConfig::VALUE_BOOL,
 			'array' => IAppConfig::VALUE_ARRAY,
-			default => throw new AppConfigIncorrectTypeException('Unknown type ' . $type)
+			default => throw new AppConfigIncorrectTypeException('Unknown type '.$type)
 		};
 	}
 
@@ -1189,7 +1189,7 @@ 
 			IAppConfig::VALUE_FLOAT => 'float',
 			IAppConfig::VALUE_BOOL => 'boolean',
 			IAppConfig::VALUE_ARRAY => 'array',
-			default => throw new AppConfigIncorrectTypeException('Unknown numeric type ' . $type)
+			default => throw new AppConfigIncorrectTypeException('Unknown numeric type '.$type)
 		};
 	}
 
@@ -1298,11 +1298,11 @@ 
 		}
 		if (strlen($app) > self::APP_MAX_LENGTH) {
 			throw new InvalidArgumentException(
-				'Value (' . $app . ') for app is too long (' . self::APP_MAX_LENGTH . ')'
+				'Value ('.$app.') for app is too long ('.self::APP_MAX_LENGTH.')'
 			);
 		}
 		if (strlen($configKey) > self::KEY_MAX_LENGTH) {
-			throw new InvalidArgumentException('Value (' . $configKey . ') for key is too long (' . self::KEY_MAX_LENGTH . ')');
+			throw new InvalidArgumentException('Value ('.$configKey.') for key is too long ('.self::KEY_MAX_LENGTH.')');
 		}
 		if ($valueType > -1) {
 			$valueType &= ~self::VALUE_SENSITIVE;
@@ -1324,7 +1324,7 @@ 
 
 		// if lazy is null or true, we debug log
 		if ($lazy === true && $app !== null) {
-			$exception = new \RuntimeException('The loading of lazy AppConfig values have been triggered by app "' . $app . '"');
+			$exception = new \RuntimeException('The loading of lazy AppConfig values have been triggered by app "'.$app.'"');
 			$this->logger->debug($exception->getMessage(), ['exception' => $exception, 'app' => $app]);
 		}
 
@@ -1362,12 +1362,12 @@ 
 		$rows = $result->fetchAll();
 		foreach ($rows as $row) {
 			// most of the time, 'lazy' is not in the select because its value is already known
-			if ($lazy && ((int)$row['lazy']) === 1) {
+			if ($lazy && ((int) $row['lazy']) === 1) {
 				$this->lazyCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
 			} else {
 				$this->fastCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
 			}
-			$this->valueTypes[$row['appid']][$row['configkey']] = (int)($row['type'] ?? 0);
+			$this->valueTypes[$row['appid']][$row['configkey']] = (int) ($row['type'] ?? 0);
 		}
 
 		$result->closeCursor();
@@ -1434,7 +1434,7 @@ 
 		 * this solution would remove the loading of config values from disabled app
 		 * unless calling the method.
 		 */
-		return $this->setTypedValue($app, $key, (string)$value, false, self::VALUE_MIXED);
+		return $this->setTypedValue($app, $key, (string) $value, false, self::VALUE_MIXED);
 	}
 
 
@@ -1505,12 +1505,12 @@ 
 	 *
 	 * @return string|int|float|bool|array
 	 */
-	private function convertTypedValue(string $value, int $type): string|int|float|bool|array {
+	private function convertTypedValue(string $value, int $type): string | int | float | bool | array {
 		switch ($type) {
 			case self::VALUE_INT:
-				return (int)$value;
+				return (int) $value;
 			case self::VALUE_FLOAT:
-				return (float)$value;
+				return (float) $value;
 			case self::VALUE_BOOL:
 				return in_array(strtolower($value), ['1', 'true', 'yes', 'on']);
 			case self::VALUE_ARRAY:
@@ -1684,7 +1684,7 @@ 
 		?bool &$lazy = null,
 		int &$type = self::VALUE_MIXED,
 		?string &$default = null,
-		?Entry &$lexiconEntry = null,
+		?Entry & $lexiconEntry = null,
 	): bool {
 		if (in_array($key,
 			[
@@ -1701,7 +1701,7 @@ 
 		}
 
 		if (!array_key_exists($key, $configDetails['entries'])) {
-			return $this->applyLexiconStrictness($configDetails['strictness'], $app . '/' . $key);
+			return $this->applyLexiconStrictness($configDetails['strictness'], $app.'/'.$key);
 		}
 
 		// if lazy is NULL, we ignore all check on the type/lazyness/default from Lexicon
@@ -1717,7 +1717,7 @@ 
 		if ($type === self::VALUE_MIXED) {
 			$type = $appConfigValueType; // we overwrite if value was requested as mixed
 		} elseif ($appConfigValueType !== $type) {
-			throw new AppConfigTypeConflictException('The app config key ' . $app . '/' . $key . ' is typed incorrectly in relation to the config lexicon');
+			throw new AppConfigTypeConflictException('The app config key '.$app.'/'.$key.' is typed incorrectly in relation to the config lexicon');
 		}
 
 		$lazy = $lexiconEntry->isLazy();
@@ -1730,7 +1730,7 @@ 
 			$type |= self::VALUE_SENSITIVE;
 		}
 		if ($lexiconEntry->isDeprecated()) {
-			$this->logger->notice('App config key ' . $app . '/' . $key . ' is set as deprecated.');
+			$this->logger->notice('App config key '.$app.'/'.$key.' is set as deprecated.');
 		}
 
 		return true;
@@ -1751,7 +1751,7 @@ 
 			return true;
 		}
 
-		$line = 'The app config key ' . $configAppKey . ' is not defined in the config lexicon';
+		$line = 'The app config key '.$configAppKey.' is not defined in the config lexicon';
 		switch ($strictness) {
 			case Strictness::IGNORE:
 				return true;

lib/public/DB/IResult.php

Indentation +110 added lines, -110 removed lines

@@ -31,114 +31,114 @@
  */
 #[Consumable(since: '21.0.0')]
 interface IResult {
-	/**
-	 * @return true
-	 *
-	 * @since 21.0.0
-	 */
-	public function closeCursor(): bool;
-
-	/**
-	 * @param int $fetchMode
-	 *
-	 * @return mixed
-	 *
-	 * @since 21.0.0
-	 * @note Since 33.0.0, prefer using fetchAssociative/fetchNumeric/fetchOne or iterateAssociate/iterateNumeric instead.
-	 */
-	public function fetch(int $fetchMode = PDO::FETCH_ASSOC);
-
-	/**
-	 * Returns the next row of the result as an associative array or FALSE if there are no more rows.
-	 *
-	 * @return array<string, mixed>|false
-	 *
-	 * @since 33.0.0
-	 */
-	public function fetchAssociative(): array|false;
-
-	/**
-	 * Returns the next row of the result as a numeric array or FALSE if there are no more rows.
-	 *
-	 * @return list<mixed>|false
-	 *
-	 * @since 33.0.0
-	 */
-	public function fetchNumeric(): array|false;
-
-	/**
-	 * Returns the first value of the next row of the result or FALSE if there are no more rows.
-	 *
-	 * @return false|mixed
-	 *
-	 * @since 21.0.0
-	 */
-	public function fetchOne();
-
-	/**
-	 * @param int $fetchMode (one of PDO::FETCH_ASSOC, PDO::FETCH_NUM or PDO::FETCH_COLUMN (2, 3 or 7)
-	 *
-	 * @return mixed[]
-	 *
-	 * @since 21.0.0
-	 * @note Since 33.0.0, prefer using fetchAllAssociative/fetchAllNumeric/fetchFirstColumn or iterateAssociate/iterateNumeric instead.
-	 */
-	public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array;
-
-	/**
-	 * Returns an array containing all the result rows represented as associative arrays.
-	 *
-	 * @return list<array<string,mixed>>
-	 * @since 33.0.0
-	 */
-	public function fetchAllAssociative(): array;
-
-	/**
-	 * Returns an array containing all the result rows represented as numeric arrays.
-	 *
-	 * @return list<list<mixed>>
-	 * @since 33.0.0
-	 */
-	public function fetchAllNumeric(): array;
-
-	/**
-	 * Returns the value of the first column of all rows.
-	 *
-	 * @return list<mixed>
-	 * @since 33.0.0
-	 */
-	public function fetchFirstColumn(): array;
-
-	/**
-	 * @return mixed
-	 *
-	 * @since 21.0.0
-	 * @deprecated 21.0.0 use \OCP\DB\IResult::fetchOne
-	 */
-	public function fetchColumn();
-
-	/**
-	 * @return int
-	 *
-	 * @since 21.0.0
-	 */
-	public function rowCount(): int;
-
-	/**
-	 * Returns an iterator over rows represented as numeric arrays.
-	 *
-	 * @return Traversable<list<mixed>>
-	 *
-	 * @since 33.0.0
-	 */
-	public function iterateNumeric(): Traversable;
-
-	/**
-	 * Returns an iterator over rows represented as associative arrays.
-	 *
-	 * @return Traversable<array<string,mixed>>
-	 *
-	 * @since 33.0.0
-	 */
-	public function iterateAssociative(): Traversable;
+    /**
+     * @return true
+     *
+     * @since 21.0.0
+     */
+    public function closeCursor(): bool;
+
+    /**
+     * @param int $fetchMode
+     *
+     * @return mixed
+     *
+     * @since 21.0.0
+     * @note Since 33.0.0, prefer using fetchAssociative/fetchNumeric/fetchOne or iterateAssociate/iterateNumeric instead.
+     */
+    public function fetch(int $fetchMode = PDO::FETCH_ASSOC);
+
+    /**
+     * Returns the next row of the result as an associative array or FALSE if there are no more rows.
+     *
+     * @return array<string, mixed>|false
+     *
+     * @since 33.0.0
+     */
+    public function fetchAssociative(): array|false;
+
+    /**
+     * Returns the next row of the result as a numeric array or FALSE if there are no more rows.
+     *
+     * @return list<mixed>|false
+     *
+     * @since 33.0.0
+     */
+    public function fetchNumeric(): array|false;
+
+    /**
+     * Returns the first value of the next row of the result or FALSE if there are no more rows.
+     *
+     * @return false|mixed
+     *
+     * @since 21.0.0
+     */
+    public function fetchOne();
+
+    /**
+     * @param int $fetchMode (one of PDO::FETCH_ASSOC, PDO::FETCH_NUM or PDO::FETCH_COLUMN (2, 3 or 7)
+     *
+     * @return mixed[]
+     *
+     * @since 21.0.0
+     * @note Since 33.0.0, prefer using fetchAllAssociative/fetchAllNumeric/fetchFirstColumn or iterateAssociate/iterateNumeric instead.
+     */
+    public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array;
+
+    /**
+     * Returns an array containing all the result rows represented as associative arrays.
+     *
+     * @return list<array<string,mixed>>
+     * @since 33.0.0
+     */
+    public function fetchAllAssociative(): array;
+
+    /**
+     * Returns an array containing all the result rows represented as numeric arrays.
+     *
+     * @return list<list<mixed>>
+     * @since 33.0.0
+     */
+    public function fetchAllNumeric(): array;
+
+    /**
+     * Returns the value of the first column of all rows.
+     *
+     * @return list<mixed>
+     * @since 33.0.0
+     */
+    public function fetchFirstColumn(): array;
+
+    /**
+     * @return mixed
+     *
+     * @since 21.0.0
+     * @deprecated 21.0.0 use \OCP\DB\IResult::fetchOne
+     */
+    public function fetchColumn();
+
+    /**
+     * @return int
+     *
+     * @since 21.0.0
+     */
+    public function rowCount(): int;
+
+    /**
+     * Returns an iterator over rows represented as numeric arrays.
+     *
+     * @return Traversable<list<mixed>>
+     *
+     * @since 33.0.0
+     */
+    public function iterateNumeric(): Traversable;
+
+    /**
+     * Returns an iterator over rows represented as associative arrays.
+     *
+     * @return Traversable<array<string,mixed>>
+     *
+     * @since 33.0.0
+     */
+    public function iterateAssociative(): Traversable;
 }

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	 *
 	 * @since 33.0.0
 	 */
-	public function fetchAssociative(): array|false;
+	public function fetchAssociative(): array | false;
 
 	/**
 	 * Returns the next row of the result as a numeric array or FALSE if there are no more rows.
@@ -64,7 +64,7 @@ 
 	 *
 	 * @since 33.0.0
 	 */
-	public function fetchNumeric(): array|false;
+	public function fetchNumeric(): array | false;
 
 	/**
 	 * Returns the first value of the next row of the result or FALSE if there are no more rows.