diff options
| author | Richard de Boer <github@tubul.net> | 2021-04-10 14:49:13 +0200 |
|---|---|---|
| committer | Richard de Boer <git@tubul.net> | 2021-05-29 14:14:52 +0200 |
| commit | f23d057ad92d77cbfeda9eed65a4874dc570761e (patch) | |
| tree | 1e371cfb577d453850bf6df57ace3ca84be9f5af | |
| parent | 697b22a5947e08a92ecd3576d5ea8515433d740b (diff) | |
| download | nextcloud-server-f23d057ad92d77cbfeda9eed65a4874dc570761e.tar.gz nextcloud-server-f23d057ad92d77cbfeda9eed65a4874dc570761e.zip | |
Fix functions taking optional parameters before required ones
PHP 8 shows deprecation warnings about this, see #25806
Removes the "default" values, as they actually are required parameters anyway.
Signed-off-by: Richard de Boer <git@tubul.net>
| -rw-r--r-- | apps/files/lib/Helper.php | 2 | ||||
| -rw-r--r-- | core/Controller/PreviewController.php | 4 | ||||
| -rw-r--r-- | lib/private/Files/Config/CachedMountFileInfo.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php index 699caec59eb..5ed11bd8663 100644 --- a/apps/files/lib/Helper.php +++ b/apps/files/lib/Helper.php @@ -217,7 +217,7 @@ class Helper { * @param ITagManager $tagManager * @return array file list populated with tags */ - public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) { + public static function populateTags(array $fileList, $fileIdentifier, ITagManager $tagManager) { $ids = []; foreach ($fileList as $fileData) { $ids[] = $fileData[$fileIdentifier]; diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php index 0b762094086..d46ecc6d157 100644 --- a/core/Controller/PreviewController.php +++ b/core/Controller/PreviewController.php @@ -156,8 +156,8 @@ class PreviewController extends Controller { Node $node, int $x, int $y, - bool $a = false, - bool $forceIcon = true, + bool $a, + bool $forceIcon, string $mode) : Http\Response { if (!($node instanceof File) || (!$forceIcon && !$this->preview->isAvailable($node))) { return new DataResponse([], Http::STATUS_NOT_FOUND); diff --git a/lib/private/Files/Config/CachedMountFileInfo.php b/lib/private/Files/Config/CachedMountFileInfo.php index 7bae52bb65d..1ca680e8a1d 100644 --- a/lib/private/Files/Config/CachedMountFileInfo.php +++ b/lib/private/Files/Config/CachedMountFileInfo.php @@ -31,7 +31,7 @@ class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInf /** @var string */ private $internalPath; - public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '', $internalPath) { + public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId, $rootInternalPath, $internalPath) { parent::__construct($user, $storageId, $rootId, $mountPoint, $mountId, $rootInternalPath); $this->internalPath = $internalPath; } |